Rev 4973: (nmb) Better explain --uncommitted in merge documentation in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4973 [merge]
revision-id: pqm at pqm.ubuntu.com-20100120142103-3omnefl6aio9bs0y
parent: pqm at pqm.ubuntu.com-20100120084353-669y35f6otlc5bm8
parent: v.ladeuil+lp at free.fr-20100120130128-0dr7e36yo7xzgdzm
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2010-01-20 14:21:03 +0000
message:
  (nmb) Better explain --uncommitted in merge documentation
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
=== modified file 'NEWS'
--- a/NEWS	2010-01-20 07:45:20 +0000
+++ b/NEWS	2010-01-20 13:01:28 +0000
@@ -52,6 +52,9 @@
   user-specified commit message editor.
   (Martin Pool, #504842)
 
+* Better explain the --uncommitted option of merge.
+  (Neil Martinsen-Burrell, #505088)
+
 * ``bzr export dir`` now requests all file content as a record stream,
   rather than requsting the file content one file-at-a-time. This can make
   exporting over the network significantly faster (54min => 9min in one

=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2010-01-18 18:35:11 +0000
+++ b/bzrlib/builtins.py	2010-01-20 13:01:28 +0000
@@ -3647,7 +3647,11 @@
     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.  
+
+    If one would like to merge changes from the working tree of the other
+    branch without merging any committed revisions, the --uncommitted option
+    can be given.
 
     To select only some changes to merge, use "merge -i", which will prompt
     you to apply each diff hunk and file change, similar to "shelve".