How do I revert an unversioned file?
Vincent Ladeuil
v.ladeuil+lp at free.fr
Thu Jan 13 22:21:40 UTC 2011
>>>>> Eric Siegerman <lists08-bzr at davor.org> writes:
> On Thu, 2011-01-13 at 10:06 -0600, Vincent Ladeuil wrote:
>> With recent enough bzr versions, 'bzr resolve file --take-this' should
>> do the same thing (and mark the conflict as resolved too).
> Nice!
> This is essentially the "bzr keep" that I suggested elsewhere
> in this thread. Consider that suggestion retracted :-)
Yeah, sorry for the delay, my mail was sent before I saw your reply but
get stucked locally :-/
Also, there is
http://wiki.bazaar.canonical.com/VincentLadeuil/ConflictResolution which
roughly document what we're aiming for.
Vincent
More information about the bazaar
mailing list