Re: [Monotone-devel] Question about mtn update --move-conflicting-paths

[Stephen Leake]

J Decker <address@hidden> writes:

> mtn update --move-conflicting-paths works pretty good under windows
> when I have updates that drop directories that are not empty.  Thank
> you greatly for providing a method to work around this.
>
> At the end of the update, the files and directories that caused the
> paths to not be empty are left in _MTN/resolutions.
>
> After a very long update, it might be nice to know that there are
> folders left in _MTN/resolutions, I think this might be logged when
> the command starts, but if you have a very long list of drops, there
> is no notification at the end.

That makes sense.

> Bug? :The documentation from mtn update --help says "move conflicting,
> unversioned paths into _MTN/conflicts before..." but there's nothing
> in _MTN/conflicts... are conflicts then moved to resolutions?

That's a manual bug; the first implementation of
--move-conflicting-paths used _MTN/conflicts, but that collides with
'mtn conflicts' stuff.

Both fixed in 8d484bdf3063bc274d833bd7442af2a35c9966c5.

-- 
-- Stephe