Patchwork [1,of,5] test-merge-local.t: print out merge state after attempting merge

login
register
mail settings
Submitter Siddharth Agarwal
Date Nov. 3, 2015, 6:23 a.m.
Message ID <10ea1863762987b74bc6.1446531810@dev6666.prn1.facebook.com>
Download mbox | patch
Permalink /patch/11269/
State Changes Requested
Headers show

Comments

Siddharth Agarwal - Nov. 3, 2015, 6:23 a.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1446520035 28800
#      Mon Nov 02 19:07:15 2015 -0800
# Node ID 10ea1863762987b74bc6431d72e8c1b160ff3499
# Parent  859f453e8b4e2b42b6b6552b79c5c5e7e2fc1cf7
test-merge-local.t: print out merge state after attempting merge

We're going to be making some changes around this code, and this gets us some
test coverage.

Patch

diff --git a/tests/test-merge-local.t b/tests/test-merge-local.t
--- a/tests/test-merge-local.t
+++ b/tests/test-merge-local.t
@@ -59,6 +59,19 @@  Local merge with bad merge tool:
   use 'hg resolve' to retry unresolved file merges
   [1]
 
+  $ hg debugmergestate
+  * version 2 records
+  local: c929647821fa73cdd20aa068da4153b2182c2731
+  other: 432e9bca7678bb78680640a7fd5143a8cb474b0f
+  file: zzz1_merge_ok (state "r", hash bad31184c814b16885cf966ecece6c1f2c255110)
+    local path: zzz1_merge_ok (flags "")
+    ancestor path: zzz1_merge_ok (node 5603a38019577b2389ad5a20dc73e0b40c25cab5)
+    other path: zzz1_merge_ok (node 55b13d8c19a24e09b1c71d9d3ed0297a238f06b6)
+  file: zzz2_merge_bad (state "u", hash df214c0bf90a1796499feb3f1ce3f58c72b44dcf)
+    local path: zzz2_merge_bad (flags "")
+    ancestor path: zzz2_merge_bad (node ad311b352574190053f53205b8d9cf0192bbd82b)
+    other path: zzz2_merge_bad (node f30237115f89b8ab8c7da179a4b82f3701da7a06)
+
   $ hg co 0
   merging zzz1_merge_ok
   merging zzz2_merge_bad
@@ -91,6 +104,19 @@  Local merge with conflicts:
   use 'hg resolve' to retry unresolved file merges
   [1]
 
+  $ hg debugmergestate
+  * version 2 records
+  local: c929647821fa73cdd20aa068da4153b2182c2731
+  other: 432e9bca7678bb78680640a7fd5143a8cb474b0f
+  file: zzz1_merge_ok (state "r", hash bad31184c814b16885cf966ecece6c1f2c255110)
+    local path: zzz1_merge_ok (flags "")
+    ancestor path: zzz1_merge_ok (node 5603a38019577b2389ad5a20dc73e0b40c25cab5)
+    other path: zzz1_merge_ok (node 55b13d8c19a24e09b1c71d9d3ed0297a238f06b6)
+  file: zzz2_merge_bad (state "u", hash df214c0bf90a1796499feb3f1ce3f58c72b44dcf)
+    local path: zzz2_merge_bad (flags "")
+    ancestor path: zzz2_merge_bad (node ad311b352574190053f53205b8d9cf0192bbd82b)
+    other path: zzz2_merge_bad (node f30237115f89b8ab8c7da179a4b82f3701da7a06)
+
   $ hg co 0
   merging zzz1_merge_ok
   merging zzz2_merge_bad
@@ -124,6 +150,15 @@  Local merge without conflicts:
   merging zzz1_merge_ok
   4 files updated, 1 files merged, 2 files removed, 0 files unresolved
 
+  $ hg debugmergestate
+  * version 2 records
+  local: c929647821fa73cdd20aa068da4153b2182c2731
+  other: 432e9bca7678bb78680640a7fd5143a8cb474b0f
+  file: zzz1_merge_ok (state "r", hash bad31184c814b16885cf966ecece6c1f2c255110)
+    local path: zzz1_merge_ok (flags "")
+    ancestor path: zzz1_merge_ok (node 5603a38019577b2389ad5a20dc73e0b40c25cab5)
+    other path: zzz1_merge_ok (node 55b13d8c19a24e09b1c71d9d3ed0297a238f06b6)
+
   $ hg diff --nodates | grep "^[+-][^<>]"
   --- a/zzz1_merge_ok
   +++ b/zzz1_merge_ok