Maintenance and sync policy with mercurial icedtea

Maintenance and sync policy

NOTE: This page shows how maintain and sync the codes between github and icedtea. If you are a contributor, you do not need to read this. If you are a maintainer, you MUST read.

Repository and Branching model

Repository and Branching flow chart is as below. We use several repositories and branches as master, develop, release and feature branches.

• master: heapstats@icedtea
• release: heapstats-2.0@icedtea
• develop: master@github
• feature branches: topic-branch@github, someone's awesome-featured-branch.

merge from topic-branches

1. Install hub and alias it eval "$(hub alias -s)".
2. Report to bugzilla and get Bug ID.
3. Review, comment and test to ready merging.
4. Get a URL of Pull Request, e.g., https://github.com/HeapStats/heapstats/pull/1
5. git am -3 <above URL> at your local repository of master. If you get a conflict, fix it and git am -continue.

• Use hub am -3 if you do not alias.

6. Add a small fixes at local repository.

• ChangeLog
• git add <changed files>

7. Commit the fixes and modify commit-message(s) to follow the icedtea format style[1].
8. PR have a single commit: git commit --amend
9. PR have multiple commits: commit the change of 6. and git rebase -i origin/master
10. push -u origin master

NOTE: if you use Fedora, you can install hub through dnf. You have to run hub in step 5.

[1]: Example of icedtea formatted message.

Bug 2797: Sync docs and config between icedtea and github
Reviewed-by: yasuenag
http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2797
Closes #<Number of issue on github>