[PATCH 5 of 5 mergedriver V2] debugmergestate: add support for printing out driver-resolved files
Siddharth Agarwal
sid0 at fb.com
Tue Oct 13 17:10:18 CDT 2015
# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1443674933 25200
# Wed Sep 30 21:48:53 2015 -0700
# Node ID 2c299720780f920356e65f24a10bc06367d3369a
# Parent 83f9eea19ddb82b29d0a4f4fbd0673a74ada9f23
debugmergestate: add support for printing out driver-resolved files
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2506,8 +2506,9 @@ def debugmergestate(ui, repo, *args):
ui.write(('other: %s\n') % record)
elif rtype == 'm':
driver, mdstate = record.split('\0', 1)
- ui.write(('merge driver: %s (state "%s")\n') % (driver, mdstate))
- elif rtype == 'F':
+ ui.write(('merge driver: %s (state "%s")\n')
+ % (driver, mdstate))
+ elif rtype in 'FD':
r = record.split('\0')
f, state, hash, lfile, afile, anode, ofile = r[0:7]
if version == 1:
More information about the Mercurial-devel
mailing list