Rev 4980: (nmb) Add documentation for multi-parent merges in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4980 [merge]
revision-id: pqm at pqm.ubuntu.com-20100121100042-77858a88k2zpec7b
parent: pqm at pqm.ubuntu.com-20100121092817-ca2wegjmyz5f715p
parent: v.ladeuil+lp at free.fr-20100121091607-a2ahtgkt3o3f8b7t
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2010-01-21 10:00:42 +0000
message:
  (nmb) Add documentation for multi-parent merges
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
=== modified file 'NEWS'
--- a/NEWS	2010-01-21 05:20:04 +0000
+++ b/NEWS	2010-01-21 09:16:07 +0000
@@ -61,9 +61,6 @@
   user-specified commit message editor.
   (Martin Pool, #504842)
 
-* Better explain the --uncommitted option of merge.
-  (Neil Martinsen-Burrell, #505088)
-
 * ``bzr diff`` will now use the epoch when it is unable to determine 
   the timestamp of a file, if the revision it was introduced in is a
   ghost. (Jelmer Vernooij, #295611)
@@ -127,9 +124,6 @@
   should appear up-to-date.)
   (John Arbash Meinel, Martin <gzlist>, #488724)
 
-* Improve discussion of pending merges in the documentation for
-  ``revert``.  (Neil Martinsen-Burrell, #505093)
-
 Improvements
 ************
 
@@ -159,6 +153,15 @@
 Documentation
 *************
 
+* Add documentation on creating merges with more than one parent.
+  (Neil Martinsen-Burrell, #481526)
+
+* Better explain the --uncommitted option of merge.
+  (Neil Martinsen-Burrell, #505088)
+
+* Improve discussion of pending merges in the documentation for
+  ``revert``.  (Neil Martinsen-Burrell, #505093)
+
 * Improved help for ``bzr send``. 
   (Martin Pool, Bojan Nikolic)
 

=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2010-01-20 13:01:28 +0000
+++ b/bzrlib/builtins.py	2010-01-21 09:13:03 +0000
@@ -3647,7 +3647,8 @@
     committed to record the result of the merge.
 
     merge refuses to run if there are any uncommitted changes, unless
-    --force is given.  
+    --force is given. The --force option can also be used to create a
+    merge revision which has more than two parents.
 
     If one would like to merge changes from the working tree of the other
     branch without merging any committed revisions, the --uncommitted option
@@ -3672,6 +3673,13 @@
         To apply a merge directive contained in /tmp/merge::
 
             bzr merge /tmp/merge
+
+        To create a merge revision with three parents from two branches
+        feature1a and feature1b:
+
+            bzr merge ../feature1a
+            bzr merge ../feature1b --force
+            bzr commit -m 'revision with three parents'
     """
 
     encoding_type = 'exact'