Changes between Version 19 and Version 20 of CommitGuides

Timestamp:

12/12/08 16:17:08 (16 years ago)

Author:

Alpar Juttner

Comment:

--

CommitGuides

@@ -60 +60 @@
  - Unfortunately Trac do not send notification on new attachments, thus please also write a separate short comment referring (see below) the changeset.
  - When referring to a patch in the ticket, please use the hash-id instead of the file-name. (In the usual way, like [8ceb318224b1]). If you do so, it will be immediately visible whether or not the changeset you are talking about is already in the main branch.
+
+== Fix a bug ==
+
+If you are about to fix a bug affecting more branches, you must place your changeset(s) on the top of the latest common ancestor of the branches. For example if you want to fix a bug existing in both the 1.0 release branch and the main one, you should do the following:
+{{{
+$ hg clone http://lemon.cs.elte.hu/hg/lemon#1.0 bugfix
+$ cd bugfix
+$ cd hg up default   <-- Actually, This is not necessary
+[... fix the bug ... ]
+$ hg ci -m 'Bugfix in BuggyTool, see #123'
+}}}
+Now merge it to the 1.0 branch
+{{{
+$ hg tag -l my-fix       # '-l' is important
+$ hg up -C 1.0
+$ hg merge my-fix
+[... do some tests (e.g. make check) ...]
+$ hg ci -m 'Merge bugfix for #123'           # Merge to 1.0
+}}}
+Finally, merge it to the main branch
+{{{
+$ hg pull http://lemon.cs.elte.hu/hg/lemon
+$ hg up -C default
+$ hg merge my-fix
+[... do some tests (e.g. make check) ...]
+$ hg ci -m 'Merge'                             # Merge is to main
+}}}