Extending 'hg resolve --list' output

Siddharth Agarwal sid at less-broken.com
Wed Jan 6 19:07:05 CST 2016


Now that 'hg resolve --list' also lists change/delete conflicts, it 
would be cool for 'hg resolve --list' to be able to tell you when a 
conflict is a change/delete one.

What should the UI for that look like?

We need to still use the 'U' and 'R' letters since whether the conflict 
is a change/delete conflict is completely orthogonal to that.

One idea is to just add a flag like --changedelete, similar to hg status 
--copies.

Eric Sumner had the idea that maybe hg resolve --list should have an 
extended output (maybe with corresponding JSON template?) that prints 
out (partial?) file nodes as well, plus possibly additional flags, 
information about renames, etc.

Thoughts?


More information about the Mercurial-devel mailing list