# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1448418381 28800
# Node ID cc9d49160adc7108e76a5488dee86a62d75aa015
# Parent  cb5bdf65420fb6fb6382813165069fedf9910e0b
debugmergestate: also recognize change/delete conflicts in the merge state

We're going to use this for tests in upcoming patches.

diff -r cb5bdf65420f -r cc9d49160adc mercurial/commands.py
--- 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)))