[Monotone-devel] resolving workspace conflicts

[Stephen Leake]

I've encountered several workspace conflicts on update recently, and
I'd like a better way to handle them.

A workspace conflict happens when a new file in a revision has the
same name as an unknown file in the workspace. A typical use case is
when everyone has the same unknown file, and someone gets around to
committing it.

mtn gives an error message like:

mtn: updating along branch 'testbranch'
mtn: selected update target 1337cb1059c4bc3e376b14381b43e9383c654da1
mtn: [left]  ba92646bf4405e1df3c258e55f9f4aa5a938cda1
mtn: [right] 1337cb1059c4bc3e376b14381b43e9383c654da1
mtn: warning: attach node 2147483664 blocked by unversioned path 'checkout.sh'
mtn: misuse: 1 workspace conflicts

One idea is to move the offending files to a directory under _MTN, so
the user could deal with them after the update succeeds. So we could
always do update as:

mtn update --move-colliding-files

and never see the above message again :). Just a similar one saying
what files had been moved.

I think someone started a branch to work on this recently, but I can't
find the branch or the mailing list thread.

Any hints?

-- 
-- Stephe