[Bug 4741] bzr shelve is confusing to me

[David Allouche]

On Thu, 2005-11-24 at 21:05 +0100, Matthieu Moy wrote:
> Brad Bollenbach <brad.bollenbach at gmail.com> writes:
> 
> In some cases, you may even want to commit
> with conflict markers and resolve them in the next revision, to keep
> track of how you solved the conflicts.

Note that you do not need to do separate commits to have that
information.

After committing a merge, the store should contain the merged-from
revision. So the merge can be re-done, and the difference between the
merged revision and the committed revision is the conflict resolution.

That's a nice property of inline conflict markers that you do not need
the complicated pre-patch + merge + post-patch decomposition that was
previously discussed in the Arch community in the context of idempotent
patches.

The advantage of committing the merge separatedly is to be able to
diagnose a-posteriori that a merge was incorrect.
-- 
                                                            -- ddaa
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051129/2695842c/attachment.pgp