Rev 5947: (jameinel) Bug #767307, in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 5947 [merge]
revision-id: pqm at pqm.ubuntu.com-20110601091513-vo5m9202wr24rbsl
parent: pqm at pqm.ubuntu.com-20110601060852-17r5jvh87xohjf22
parent: nmb at wartburg.edu-20110531183032-27wmza8hcahs2cm0
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2011-06-01 09:15:13 +0000
message:
  (jameinel) Bug #767307,
   improve the merge --force documentation. (Neil Martinsen-Burrell)
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2011-05-27 17:57:23 +0000
+++ b/bzrlib/builtins.py	2011-05-31 18:30:32 +0000
@@ -3879,7 +3879,9 @@
     committed to record the result of the merge.
 
     merge refuses to run if there are any uncommitted changes, unless
-    --force is given. The --force option can also be used to create a
+    --force is given.  If --force is given, then the changes from the source 
+    will be merged with the current working tree, including any uncommitted
+    changes in the tree.  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

=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt	2011-06-01 03:27:06 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt	2011-06-01 09:15:13 +0000
@@ -63,6 +63,9 @@
 
 .. Improved or updated documentation.
 
+* Improve documentation of ``bzr merge --force``.
+  (Neil Martinsen-Burrell, #767307)
+
 API Changes
 ***********