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

[Stephen Leake]

J Decker <address@hidden> writes:

> I dunno, maybe a quick dump of what is untracked in _MTN/resolutions
> at the end?  

I just added "some files moved to _MTN/resolutions"

> or a way to list that real quick?

ls -r _MTN/resolutions

> if contains other things than 'resolutions'  maybe move that stuff
> back into the tree?  

In general, that's dangerous; you are overwriting committed files. But
mtn revert would undo it.

> most of what was in the directory was temp files (*.c~ ) .obj, and
> other ignored things.

That happens when the conflicting item is a directory; hopefully
that's not common. But it would be annoying when it happens.

> maybe it's already doing this?

no.

-- 
-- Stephe