How do I revert an unversioned file?

Eli Zaretskii eliz at gnu.org
Thu Jan 13 14:08:40 UTC 2011


> Date: Thu, 13 Jan 2011 14:29:17 +0200
> From: Alexander Belchenko <bialix at ukr.net>
> CC: Eric Siegerman <lists08-bzr at davor.org>, bazaar at lists.canonical.com
> 
> Eli Zaretskii пишет:
> >> From: Eric Siegerman <lists08-bzr at davor.org>
> >> Date: Thu, 13 Jan 2011 05:06:17 -0500
> >>
> >> On Thu, 2011-01-13 at 04:00 -0500, Glenn Morris wrote:
> >>> Contents conflict in path/to/file
> >>> bzr revert path/to/file
> >>> bzr: ERROR: Path(s) are not versioned: path/to/file
> >> Try "bzr revert path/to/file.OTHER".  Strange but true...
> > 
> > Could you say a few words about how this works and why?
> 
> On some conflicts bzr renames files to file.OTHER / file.THIS.
> You should see that fact in the bzr status output.

Yes, I know about THIS and OTHER.  But none of them is a versioned
file, right?  So what is the semantics of "bzr revert
path/to/file.OTHER"?  What does "bzr revert" do in this case?

> Therefore you should operate on new name.

Sorry, I don't understand what you mean here.

Thanks.



More information about the bazaar mailing list