Mercurial > emacs
comparison admin/notes/bzr @ 108641:c8d754c15c55
Advise against unnecessary merges from trunk to feature branches.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Tue, 18 May 2010 10:38:35 +0300 |
parents | 4a00100075b5 |
children | d074b0e8afef |
comparison
equal
deleted
inserted
replaced
108640:0b7cdd98b42f | 108641:c8d754c15c55 |
---|---|
24 commits, it is fine to do a merge. If your branch has only a very | 24 commits, it is fine to do a merge. If your branch has only a very |
25 small number of "real" commits, but several "merge from trunks", it is | 25 small number of "real" commits, but several "merge from trunks", it is |
26 preferred that you take your branch's diff, apply it to the trunk, and | 26 preferred that you take your branch's diff, apply it to the trunk, and |
27 commit directly, not merge. This keeps the history cleaner. | 27 commit directly, not merge. This keeps the history cleaner. |
28 | 28 |
29 In general, when working on some feature in a separate branch, it is | |
30 preferable not to merge from trunk until you are done with the | |
31 feature. Unless you really need some change that was done on the | |
32 trunk while you were developing on the branch, you don't really need | |
33 those merges; just merge once, when you are done with the feature, and | |
34 Bazaar will take care of the rest. Bazaar is much better in this than | |
35 CVS, so interim merges are unnecessary. | |
36 | |
29 Or use shelves; or rebase; or do something else. See the thread for | 37 Or use shelves; or rebase; or do something else. See the thread for |
30 yet another fun excursion into the exciting world of version control. | 38 yet another fun excursion into the exciting world of version control. |
31 | 39 |
32 http://lists.gnu.org/archive/html/emacs-devel/2010-04/msg00086.html | 40 http://lists.gnu.org/archive/html/emacs-devel/2010-04/msg00086.html |