"bzr revert" leaves a mess

[Robert Collins]

On Wed, 2006-02-22 at 17:21 -0500, Aaron Bentley wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Robert Collins wrote:
> > On Wed, 2006-02-22 at 13:45 -0500, Aaron Bentley wrote:
> 
> >>How about this:
> >>When a merge is applied, we note the hashes of the new/modified files
> >>somewhere in .bzr.
> 
> > Can't we tell that the file came in from a merge from the
> > pending-merge's inventory ? Which also has the hash that it came in with
> > - so we don't need to record that anywhere.
> 
> If the file contents were generated by diff3 or merge3 or weave merge,
> there will be no existing sha1 for it, and yet it will be a throwaway file.

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?

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/9eaa999e/attachment.pgp