[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r100342: Advise against unnecessary m
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r100342: Advise against unnecessary merges from trunk to feature branches. |
Date: |
Tue, 18 May 2010 10:38:35 +0300 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100342
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Tue 2010-05-18 10:38:35 +0300
message:
Advise against unnecessary merges from trunk to feature branches.
modified:
admin/notes/bzr
=== modified file 'admin/notes/bzr'
--- a/admin/notes/bzr 2010-05-18 02:52:21 +0000
+++ b/admin/notes/bzr 2010-05-18 07:38:35 +0000
@@ -26,6 +26,14 @@
preferred that you take your branch's diff, apply it to the trunk, and
commit directly, not merge. This keeps the history cleaner.
+In general, when working on some feature in a separate branch, it is
+preferable not to merge from trunk until you are done with the
+feature. Unless you really need some change that was done on the
+trunk while you were developing on the branch, you don't really need
+those merges; just merge once, when you are done with the feature, and
+Bazaar will take care of the rest. Bazaar is much better in this than
+CVS, so interim merges are unnecessary.
+
Or use shelves; or rebase; or do something else. See the thread for
yet another fun excursion into the exciting world of version control.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r100342: Advise against unnecessary merges from trunk to feature branches.,
Eli Zaretskii <=