bzr merge --preview fails when uncommitted changes
Bug #207512 reported by
Stefan Monnier
This bug affects 2 people
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Bazaar |
Confirmed
|
Wishlist
|
Unassigned | ||
Bug Description
If I have uncommitted changes in my tree, I cannot do "bzr merge --preview":
% bzr merge --preview
Merging from remembered location /home/monnier/
bzr: ERROR: Working tree "/home/
%
but actually, the uncommitted changes have no effect: I can understand that we disallow/discourage merging into an uncommitted tree, but "bzr merge --preview" just shows the same diff, whether or not the local changes are committed (except maybe when those changes include a pending merge from the same branch, but that's no excuse for disallowing the operation).
Revision history for this message
| Martin Pool (mbp) wrote | #1 |
| Changed in bzr: | |
| importance: | Undecided → Wishlist |
| status: | New → Confirmed |
Revision history for this message
| John A Meinel (jameinel) wrote | #2 |
Revision history for this message
| Vincent Ladeuil (vila) wrote | #3 |
| tags: | added: check-for-breezy |
To post a comment you must log in.
The uncommitted changes should affect the diff, as they are taken into account for the merge.
You should be able to work around this with --force, but I agree it should not be required.