[rfc] remove foo.bar; add foo.bar -> make this no-op?
John Arbash Meinel
john at arbash-meinel.com
Thu Sep 14 13:49:38 BST 2006
Alexander Belchenko wrote:
> If I have some tree and during my work accidentally remove some
> versioned file by
>
> $ bzr remove foo.bar
>
> Then it becomes unversioned. There is no way (only revert) to undo this.
> Sometimes it's enough, but sometimes not. E.g. when I do manual
> resolving of merge conflicts I simply don't want to undo all work.
> If I do 'bzr add' before 'bzr commit' file becomes versioned again but
> with another file-id. So bzr treats it as fresh new file.
>
> Is there is a way to tell bzr that this added file is old file, i.e. use
> old file-id and don't break file history?
You do realize that you can do 'bzr revert foo.bar', right?
Which only changes that one file, and doesn't effect the status of the
merge, etc.
John
=:->
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060914/1b983622/attachment.pgp
More information about the bazaar
mailing list