bzr shelve doesn't completely shelve a merge
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Bazaar |
Confirmed
|
Medium
|
Unassigned | ||
| Breezy |
Triaged
|
Medium
|
Unassigned | ||
Bug Description
When I attempt to shelve a merge that I make, bzr does not shelve the merge data along with it, but the file changes are shelved successfully. I am using bzr 1.13.
To reproduce:
bzr branch lp:~something/to/branch
cd branch
bzr merge lp:~something/to/merge
bzr shelve --all
bzr status
Expected result:
<Nothing printed>
Actual result:
pending merge tips: (use -v to see all merge revisions)
<Tip of something to be merged, but isn't actually there to be merged>
No traceback was available. bzr exited normally in all circumstances.
If I were to make a change and commit it here and push it up, bzr refuses to let me merge the branch if I tried to do it on another machine after I update it. This has the effect of preventing me from merging the branch again if I try to do so. Bzr just reports "Nothing to do" when this happens.
| Changed in bzr: | |
| importance: | Undecided → Medium |
| status: | New → Confirmed |
| Chris Lasher (chris.lasher) wrote | #1 |
| tags: | added: shelf |
| tags: | added: check-for-breezy |
| Changed in brz: | |
| status: | New → Triaged |
| importance: | Undecided → Medium |
| tags: |
added: shelve removed: check-for-breezy shelf |
| tags: |
added: shelf removed: shelve |
Would it be possible to have `bzr shelve` unset the "merged" flag, then reapply the "merged" (and concomitant information) flag with `bzr unshelve`?
Some things are worth noting:
* For `bzr shelve --all` this would help, and is probably the expected behavior. For partial shelves, though, it becomes more ambiguous. Could `bzr shelve` get an additional flag, such as `bzr shelve --merge`?
* Suppose the user shelves the merge, makes a commit, re-does the merge manually (i.e., via `bzr merge`). What will happen when unshelving the previous merge attempt?