[PATCH 0 of 2] New resolve command

[Alexis S. L. Carvalho]

Thus spake Matt Mackall:
> Comments?

I think this looks mostly OK, but I wonder if we want to add some
special handling for divergent renames (local renamed foo to bar, remote
renamed it to baz).  Since we view renames as pairs of copy+remove
operations, it might make some sense to say that there is no conflict
here, but in many cases having a commit with both bar and baz would be
an error.

Right now we can "fix" the dirstate by doing something like
"hg rename -Af baz bar", but that won't help you if you also have to
merge their contents.  I'm wondering if there's something resolve could
do here.

Another issue is that the merge/state file won't really work if you have
filenames with spaces.

I was going to mention that most of the data saved in merge/state can be
inferred from the dirstate, but then I noticed that's only true after a
"hg merge" (i.e. it wouldn't work after a "hg update").

Alexis