How do I revert an unversioned file?

[Forest Bond]

Hi,

I didn't see anyone mention this way:

  $ rm -f path/to/file path/to/file.THIS path/to/file.OTHER
  $ bzr resolve path/to/file

Not fancy, but it works.

Thanks,
Forest
-- 
Forest Bond
http://www.alittletooquiet.net
http://www.pytagsfs.org

On Thu, Jan 13, 2011 at 04:00:59AM -0500, Glenn Morris wrote:
> 
> I did a merge from branch B to branch A.
> A file that was originally in both branches had been removed
> from branch A, and modified in B. It should not be re-added to A.
> The result of the merge is a contents conflict in A that I cannot resolve:
> 
> Contents conflict in path/to/file
> bzr revert path/to/file
> bzr: ERROR: Path(s) are not versioned: path/to/file
> 
> Sigh. I've had a similar state several times before from various other
> operations.
> 
> I normally give up at this point and use `bzr revert path/to/'.
> But there are a bunch of other changes in that directory that I do
> not want to revert.
> 
> How do I revert an unversioned file?
> 
> Thanks.
> 
> PS Do you prefer questions like this to be asked here or via
> https://answers.launchpad.net/bzr/ ?
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/bazaar/attachments/20110114/31d8ef53/attachment.pgp>