Insufficient documentation of "merge --force"
Bug #767307 reported by
Eli Zaretskii
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Bazaar |
Fix Released
|
Medium
|
Martin Pool | ||
Bug Description
The documentation of "bzr merge" says:
--force Merge even if the destination tree has uncommitted
...
merge refuses to run if there are any uncommitted changes, unless
--force is given.
What it does not say is what is the effect of using "merge --force" on the branch with uncommitted changes. Will it overwrite the uncommitted changes, or will it merge the other branch with them, the way "bzr update" does (when updating from a parent branch into a branch that has local changes)?
Without having this information, --force sounds like a dangerous advanture.
Related branches
lp://qastaging/~nmb/bzr/merge-force-doc
- Jelmer Vernooij (community): Abstain (code)
- Eli Zaretskii: Pending requested
-
Diff: 27 lines (+6/-1)2 files modifiedbzrlib/builtins.py (+3/-1)
doc/en/release-notes/bzr-2.4.txt (+3/-0)
Revision history for this message
| Martin Pool (mbp) wrote | #1 |
| Changed in bzr: | |
| importance: | Undecided → Medium |
| status: | New → Confirmed |
| tags: | added: doc easy help merge |
| Changed in bzr: | |
| assignee: | nobody → Martin Pool (mbp) |
| milestone: | none → 2.4b4 |
| status: | Confirmed → Fix Released |
To post a comment you must log in.
Thanks for pointing that out. It does indeed merge the source tree into the uncommitted changes; they're not lost. If you want to lose them, shelve or revert first. The reason it's slightly dangerous is that if the merge is very messy (lots of conflicts), you may wish that you'de committed your own changes first.