Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
debugmergestate: also recognize change/delete conflicts in the merge state
authorSiddharth Agarwal <sid0@fb.com>
Tue, 24 Nov 2015 18:26:21 -0800
changeset 27135 cc9d49160adc
parent 27134 cb5bdf65420f
child 27136 29b08ca680b0
debugmergestate: also recognize change/delete conflicts in the merge state We're going to use this for tests in upcoming patches.
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Mon Nov 30 10:26:37 2015 -0800
+++ b/mercurial/commands.py	Tue Nov 24 18:26:21 2015 -0800
@@ -2562,7 +2562,7 @@
                 driver, mdstate = record.split('\0', 1)
                 ui.write(('merge driver: %s (state "%s")\n')
                          % (driver, mdstate))
-            elif rtype in 'FD':
+            elif rtype in 'FDC':
                 r = record.split('\0')
                 f, state, hash, lfile, afile, anode, ofile = r[0:7]
                 if version == 1:
@@ -2571,7 +2571,7 @@
                 else:
                     onode, flags = r[7:9]
                 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
-                         % (f, rtype, state, hash))
+                         % (f, rtype, state, _hashornull(hash)))
                 ui.write(('  local path: %s (flags "%s")\n') % (lfile, flags))
                 ui.write(('  ancestor path: %s (node %s)\n')
                          % (afile, _hashornull(anode)))
Mercurial