[doc] insufficient documentation of "merge --uncommitted"
Bug #505088 reported by
Eli Zaretskii
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Bazaar |
Fix Released
|
Low
|
Unassigned | ||
Bug Description
From the documentation of "bzr merge":
bzr merge
--uncommitted Apply uncommitted changes from a working copy,
instead of branch changes.
What are ``branch changes''? what branch is it talking about?
Also, it is not clear if the _only_ uncommitted changes will be applied, or both committed and uncommitted.
Related branches
lp:~nmb/bzr/fix-505088
- Vincent Ladeuil: Approve
-
Diff: 34 lines (+9/-1)2 files modifiedNEWS (+6/-0)
bzrlib/builtins.py (+3/-1)
| tags: | added: doc |
Revision history for this message
| Martin Pool (mbp) wrote | #1 |
| Changed in bzr: | |
| status: | New → Confirmed |
| importance: | Undecided → Low |
| tags: | added: easy |
| Changed in bzr: | |
| status: | Confirmed → Fix Released |
| milestone: | none → 2.1.0rc1 |
To post a comment you must log in.
Suppose I have two branches a and b, and I'm in the working tree of a. The common ancestor of a and b is r10, and b has two later commits up to r12.
% bzr merge ../b
will merge r11 and r12.
% bzr merge ../b --uncommitted
will merge only the uncommitted changes in b's working tree, if there are any. Like doing 'bzr diff ../b|patch -p0', but also handling renames etc.
hth.
I agree this should be clearer in the help.