[BUG] Re: Adding and reverting a file deletes the file

[Michael Ellerman]

On Fri, 7 Oct 2005 12:24, John A Meinel wrote:
> Michael Ellerman wrote:
> >>But when we want to add a file that's not there, it's pretty clear that
> >>we've got to create it.  It's less clear what to do when we remove a
> >>file.  But if we always removed, never deleted, then merge would be a
> >>vector for installing unversioned files.
> >
> > I think you're referring to foo.(THIS|OTHER|BASE) ? Isn't that just a
> > "feature" of the merge code?
>
> I think you are missing the fact that "bzr revert" is just
> bzr merge -r <working dir>..<last commit>

I don't know, or care, how revert is implemented - I'm just describing what I 
think is sane behaviour.

> But I think these are also solutions:
>
> A) Having revert create the FILE~ when it deletes
> B) Creating the changeset that we have talked about
> C) Robert's suggestion that merge would see if the file has ever
> existed, in which case it is a genuine delete.

I don't really like A, Robert's suggestion seemed like a reasonable 
workaround.

cheers

-- 
Michael Ellerman
IBM OzLabs

email: michael:ellerman.id.au
inmsg: mpe:jabber.org
wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)

We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051007/75a6a6f6/attachment.pgp