How do I revert an unversioned file?
Alexander Belchenko
bialix at ukr.net
Thu Jan 13 12:29:17 UTC 2011
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.
Therefore you should operate on new name.
HTH
More information about the bazaar
mailing list