interrupting a merge session

[Peter Weseloh]

> It would be great if mercurial keeps track of "files waiting to be
> merged".
> It would also help to provide a command like "hg resolve" so that a
> user could take files off and on the list. It is handy if certain
> files should be merged by someone else like a more experience
> developer, project lead, etc.
>
>
I think a first step in that direction could be a "--dry-run" option for the
"merge" command to see what "merge" would do, so I implemented it.  It's the
first time I send in a patch and I have no clue about python so be warned!

I think it would also be good if one could specify files to consider for
merging, e.g. to re-do a merge. I wonder if the "partial" parameter of the
"update" function in merge.py could be useful for implementing that?

Peter
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20070616/c9e50b4d/attachment-0001.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: merge_dryrun.patch
Type: text/x-patch
Size: 10292 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20070616/c9e50b4d/attachment-0003.bin>