Comment 1 for bug 345227

Revision history for this message
Chris Lasher (chris.lasher) wrote :

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?