"bzr revert" leaves a mess

[Robert Collins]

On Wed, 2006-02-22 at 17:51 -0500, Aaron Bentley wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Robert Collins wrote:
> > But to have it generated by diff3 or merge3 or weave merge does it not
> > need to exist in both the base ancestor and the 'other' tree?
> 
> No, when a file exists in only THIS and OTHER, we invoke diff3 or merge3
>  with an empty BASE, to get two-way merging.  But that's beside the point.
> 
> We don't have a sha1 for the result of the merge.  And if the user
> hasn't changed the result of the merge, it's legit to zorch it with no
> backup.  But if they've modified it, then I think a backup is required.

ok

Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- 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/20060223/59980145/attachment.pgp