want a way to record a pending merge without merging the texts
Bug #348227 reported by
Martin Pool
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Bazaar |
Confirmed
|
Wishlist
|
Unassigned | ||
Bug Description
It would sometimes be useful to add a pending merge without actually merging the texts, when the merge has be done externally. For instance, when adding merge arrows for data imported from cvs. This is like the opposite of 'revert --forget-merges'.
As a workaround, merge then 'revert .'.
I can't think of a great option name, maybe 'merge --pretend'.
| Changed in bzr: | |
| importance: | Undecided → Wishlist |
| status: | New → Triaged |
| tags: | added: merge |
| Changed in bzr: | |
| status: | Triaged → Confirmed |
| tags: | added: check-for-breezy |
To post a comment you must log in.
