[Monotone-devel] nvm.resolve_conflicts ready to land on mainline

[Stephen Leake]

I believe nvm.resolve_conflicts is ready to land on mainline.

The main feature on this branch is the new set of commands 'mtn
conflicts *', that provide asynchronous conflict resolution, and an
automated resolution for duplicate name conflicts. More on this below.

In addition, there are some other small changes in behavior:

paths.cc normalize_external_path no longer rejects "" as a path. This
simplifies parsing the conflict resolution file, and makes other path
handling more consistent. This was discussed here briefly, with no
solid conclusion.

Several file_path functions now take an argument "to_workspace_root"
indicating that the path is relative to the workspace root, not the
current directory.

The --message or --message-file argument to merge and propagate
specify the user part of the commit message; the current 'merge rev
rev' or 'propagate from to' message is automatically prefixed. The
prefix can be suppressed by --no-prefix.


To understand the 'mnt conflicts' commands, I suggest you start by
reading the info node Advanced Uses | Merge Conflicts, which has
examples of using the conflicts commands to resolve content and
duplicate name conflicts.

Then move on the tests that start with 'resolve_conflicts'; they
contain more examples.

--
-- Stephe