Mercurial > public > mercurial-scm > hg

diff mercurial/commands.py @ 26976:c48fee950ce4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
debugmergestate: print out record type for files We're going to add a separate record type for change/delete conflicts soon. We need to make sure they get stored with the correct record type so that older versions of Mercurial correctly abort when they see change/delete records.
author Siddharth Agarwal <sid0@fb.com>
date Fri, 13 Nov 2015 23:01:36 -0800
parents 216cc65cf227
children d240ae897ba6
line wrap: on
line diff
--- a/mercurial/commands.py	Sun Nov 15 22:45:20 2015 -0800
+++ b/mercurial/commands.py	Fri Nov 13 23:01:36 2015 -0800
@@ -2547,8 +2547,8 @@
                     flags = r[7]
                 else:
                     onode, flags = r[7:9]
-                ui.write(('file: %s (state "%s", hash %s)\n')
-                         % (f, state, hash))
+                ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
+                         % (f, rtype, state, hash))
                 ui.write(('  local path: %s (flags "%s")\n') % (lfile, flags))
                 ui.write(('  ancestor path: %s (node %s)\n') % (afile, anode))
                 ui.write(('  other path: %s (node %s)\n') % (ofile, onode))