Display conflicts to be resolved.
Jens Alfke
jens at mooseyard.com
Wed Aug 8 19:35:59 CDT 2007
On 8 Aug '07, at 6:01 AM, John Levon wrote:
> The argument goes that hg itself should not know about conflict
> markers
> (and therefore shouldn't warn you when you commit them, etc.). It's
> still a mystery to me why this should be so :)
I can understand about the ">>>" etc. marker text. But shouldn't hg
have a special file status to indicate a file that has unresolved
conflicts? Both CVS and SVN do.
Is the idea that, if you're not prepared to do a manual merge right
then, you should cancel the whole merge operation, leaving the
multiple heads unreconciled in the repository until you're ready to
come back and do the merging?
If so, how do you cancel the merge halfway through when you're sitting
in an external merge-viewer utility? Do you go back to the shell that
has hg running and Ctrl-C it? Will that back out everything that
happened so far?
--Jens
More information about the Mercurial
mailing list