I'd like a quick way to know how many conflicts I will need to merge manually. Is this built-in? Or is there an existing tool to use as the merger to just count this?
views:
42answers:
1
+2
A:
There's no built in predictor command, as it would take as much effort computationally as doing the merge. However, if you do a hg --config ui.merge=internal:fail merge it will exit immediately and you can do a hg resolve --list.
That will show you what you're in for, and you can either continue with hg resolve --all or give up with hg update -C .
Ry4an
2010-05-27 22:29:17
When you say exit immediately you don't mean Ctrl-C while merge is running do you?
dimo414
2010-05-27 23:19:16
No, just exit the merge tools that launches w/o saving anything or picking anything. Alternately you could do the merge like this:hg --config ui.merge=internal:fail mergewhich will dump you right back to the command prompt so you can do your 'hg resolve --list'.
Ry4an
2010-05-28 14:47:30
Using the --config... works great. Thanks to Ry4an for the answer and clarification and to dimo414 for asking the question needed to get the clarification!
Brandon Leiran
2010-06-04 19:32:37