[Monotone-commits-diffs] net.venge.monotone.issue-209: b9bca9e1b62bd1c9e8355b74981c1c39a8435fd6

[code]

revision:            b9bca9e1b62bd1c9e8355b74981c1c39a8435fd6
date:                2012-07-22T16:41:46
author:              address@hidden
branch:              net.venge.monotone.issue-209
changelog:
dropped_modified_conflicts: more test cases; only few left

* src/merge_conflict.cc (report_dropped_modified_conflicts): don't repeat 
ancestor rev for each conflict. factor out 'history will be lost' message.

* test/func/resolve_conflicts_dropped_modified_1/conflicts-recreated-resolved:
* test/func/resolve_conflicts_dropped_modified_1/conflicts-recreated:
* test/func/resolve_conflicts_dropped_modified_1/__driver__.lua: cover rest of 
test cases

* 
test/func/resolve_conflicts_dropped_modified_upstream_vs_local_2/__driver__.lua:
* test/func/resolve_conflicts_dropped_modified_2/__driver__.lua:
* test/func/resolve_conflicts_dropped_modified_1/show_conflicts-orphaned:
* test/func/resolve_conflicts_dropped_modified_1/show_conflicts: match code 
changes

* 
test/func/resolve_conflicts_dropped_modified_upstream_vs_local_attr/__driver__.lua:
 add test with swapped left/right

* test/func/resolve_conflicts_orphaned_file/__driver__.lua: delete unneeded 
FIXME

manifest:
format_version "1"

new_manifest [585648b652aafd83e6d0a0fd2f9affb396c1dab3]

old_revision [4f2462d54adbe31abf38ccbb025af9830166feee]

patch "src/merge_conflict.cc"
 from [13a9a9235a39333ad6a247b138dc449b6e2b0fc8]
   to [b47a70720f836809f06347360ee91ddf587b5721]

patch "test/func/resolve_conflicts_dropped_modified_1/__driver__.lua"
 from [70accbfc43f720b90015d36f7df006a46d473351]
   to [d90af7e9fcf95394fa2c4f5fdd62781552483a8b]

patch "test/func/resolve_conflicts_dropped_modified_1/conflicts-recreated"
 from [826d98ed030373bb9b0b778c1a1da792b8f4009a]
   to [3f43d9d13d0149e3be0fa3a7a8695182dbc871ea]

patch 
"test/func/resolve_conflicts_dropped_modified_1/conflicts-recreated-resolved"
 from [096988d5f8102507e0e2783f7a6954512a167da5]
   to [7937832db9408aeadbbeed472d86f29ef3394a06]

patch "test/func/resolve_conflicts_dropped_modified_1/show_conflicts"
 from [74f0f311dee5ce970396bed354b6ab0fd97077f0]
   to [cce385ec522c8e4885cac7d3375896aaa507f0e0]

patch "test/func/resolve_conflicts_dropped_modified_1/show_conflicts-orphaned"
 from [fbe2c5cc2c59c6fec1121e3be9469d370b9ed5cb]
   to [e343653ac3989164acb2dbb54f3f97b035d28de6]

patch "test/func/resolve_conflicts_dropped_modified_2/__driver__.lua"
 from [5595825e6da1a21e03d0ff0aab288d27755df0a7]
   to [81b11d9ab24ad470156b95e8be8efd9dc1645156]

patch 
"test/func/resolve_conflicts_dropped_modified_upstream_vs_local_2/__driver__.lua"
 from [f1d2d4f0ba195e43ee31e57f42a9396971656833]
   to [44b9528be152a46e15ddfcd5947dce86f13b76a8]

patch 
"test/func/resolve_conflicts_dropped_modified_upstream_vs_local_attr/__driver__.lua"
 from [5ca6fd173e372916aa7d3e29f902a1837825a497]
   to [abe2836cc2dfbae368820e3b5515ad587911c71b]

patch "test/func/resolve_conflicts_orphaned_file/__driver__.lua"
 from [5c2b5eb76fd3a1e97da6e549443037dc0698e17d]
   to [beb41b901c1e08bbef25e87fe0b2ef36e74a2a8b]
============================================================
--- src/merge_conflict.cc	13a9a9235a39333ad6a247b138dc449b6e2b0fc8
+++ src/merge_conflict.cc	b47a70720f836809f06347360ee91ddf587b5721
@@ -1204,7 +1204,7 @@ roster_merge_result::report_dropped_modi
         }
       else
         {
-          P(F("conflict: file '%s' from revision %s") % ancestor_name % lca_rid);
+          P(F("conflict: file '%s'") % ancestor_name);
           switch (conflict.dropped_side)
             {
             case resolve_conflicts::left_side:
@@ -1713,6 +1713,7 @@ static char const * const conflict_resol
 
 static char const * const conflicts_mismatch_msg = N_("conflicts file does not match current conflicts");
 static char const * const conflict_resolution_not_supported_msg = N_("%s is not a supported conflict resolution for %s");
+static char const * const history_lost_msg = N_("history for '%s' from %s will be lost; see user manual Merge Conflicts section");
 static char const * const conflict_extra = N_("extra chars at end of conflict");
 
 static void
@@ -2861,8 +2862,7 @@ create_new_node(roster_t const &        
 
   P(F("replacing content of '%s' from %s with '%s'") % parent_name % side_image % new_content->as_external());
 
-  // FIXME: factor out 'history lost' msg
-  P(F("history for '%s' from %s will be lost; see user manual Merge Conflicts section") % parent_name % side_image);
+  P(F(history_lost_msg) % parent_name % side_image);
 
   data result_raw_data;
   read_data(*new_content, result_raw_data);
@@ -2993,8 +2993,7 @@ resolve_dropped_modified_one(lua_hooks &
           // modified; keep the modified contents
 
           P(F("keeping '%s' from %s") % name % side_image);
-          P(F("history for '%s' from %s will be lost; see user manual Merge Conflicts section") %
-            name % side_image);
+          P(F(history_lost_msg) % name % side_image);
 
           // We'd like to just attach_node here, but that violates a
           // fundamental design principle of mtn; nodes are born once,
@@ -3025,7 +3024,7 @@ resolve_dropped_modified_one(lua_hooks &
           result_roster.drop_detached_node(nid);
 
           P(F("renaming '%s' from %s to '%s'") % name % side_image % resolution.rename.as_external());
-          P(F("history for '%s' from %s will be lost; see user manual Merge Conflicts section") % name % side_image);
+          P(F(history_lost_msg) % name % side_image);
 
           node_id new_nid = result_roster.create_file_node(fid, nis);
           attach_node (lua, result_roster, new_nid, resolution.rename);
============================================================
--- test/func/resolve_conflicts_dropped_modified_1/__driver__.lua	70accbfc43f720b90015d36f7df006a46d473351
+++ test/func/resolve_conflicts_dropped_modified_1/__driver__.lua	d90af7e9fcf95394fa2c4f5fdd62781552483a8b
@@ -1,5 +1,8 @@
 -- Test reporting and resolving drop/modified conflicts
 --
+-- tests for the restrictions imposed by orphan, resoltion consistency
+-- are in resolved_dropped_modified_3
+-- 
 -- other resolve_conflicts_dropped_modified_* tests validate resolving
 -- in extended use cases.
 
@@ -14,7 +17,7 @@
 -- and resolution:
 --
 -- state    resolution      left file       right file
--- dropped  drop            file_3 etc          file_2 etc
+-- dropped  drop            file_3 etc      file_2 etc
 --          keep            (not supported)
 --          rename          (not supported)
 --          user            (not supported)
@@ -22,17 +25,16 @@
 -- 
 -- modified drop            file_2      file_3 etc
 --          keep            file_4      file_5
---          rename                      file_9
+--          rename          file_14     file_9
 --          user            file_6      file_7
---          user_rename                 file_10
+--          user_rename     file_15     file_10
 -- 
--- recreated drop                       file_12
---           keep           file_12
---           rename     
---           user           file_13
---           user_rename
+-- recreated drop           file_16     file_12
+--           keep           file_12     file_14
+--           rename         file_17     file_15
+--           user           file_13     file_16
+--           user_rename    file_18     file_13
 --
---  There are also other tests for the restrictions imposed by orphan etc.
 
 mtn_setup()
 
@@ -329,16 +331,32 @@ addfile("file_12", "file_12 base") -- mo
 -- Test recreated; drop then re-add vs modify. This used to be the test
 -- "merge((patch_a),_(drop_a,_add_a))"
 addfile("file_12", "file_12 base") -- modify in left; drop, add in right: keep left, drop right
-addfile("file_13", "file_13 base") -- drop, add in left; modify in right: user left, drop right
+addfile("file_13", "file_13 base") -- drop, add in left; modify in right: user left, user_rename right
+
+-- Other cases not covered above
+addfile("file_14", "file_14 base") -- modify in left; recreated in right: rename left, keep right
+addfile("file_15", "file_15 base") -- modify in left; recreated in right: user_rename left, rename right
+addfile("file_16", "file_16 base") -- recreated in left; modify in right: drop left, rename right
+addfile("file_17", "file_17 base") -- recreated in left; modify in right: rename left, drop right
+addfile("file_18", "file_18 base") -- recreated in left; modify in right: user_rename left, drop right
 commit("testbranch", "base 4")
 base_4 = base_revision()
 
 writefile("file_12", "file_12 left")
+check(mtn("drop", "file_13"), 0, false, false)
 
-check(mtn("drop", "file_13"), 0, false, false)
+writefile("file_14", "file_14 left")
+writefile("file_15", "file_15 left")
+
+check(mtn("drop", "file_16"), 0, false, false)
+check(mtn("drop", "file_17"), 0, false, false)
+check(mtn("drop", "file_18"), 0, false, false)
 commit("testbranch", "left 4a")
 
 addfile("file_13", "file_13 left re-add")
+addfile("file_16", "file_16 left re-add")
+addfile("file_17", "file_17 left re-add")
+addfile("file_18", "file_18 left re-add")
 commit("testbranch", "left 4b")
 left_4 = base_revision()
 
@@ -346,24 +364,46 @@ writefile("file_13", "file_13 right")
 
 check(mtn("drop", "file_12"), 0, false, false)
 writefile("file_13", "file_13 right")
+check(mtn("drop", "file_14"), 0, false, false)
+check(mtn("drop", "file_15"), 0, false, false)
+writefile("file_16", "file_16 right")
+writefile("file_17", "file_17 right")
+writefile("file_18", "file_18 right")
 commit("testbranch", "right 4a")
 
 addfile("file_12", "file_12 right re-add")
+addfile("file_14", "file_14 right re-add")
+addfile("file_15", "file_15 right re-add")
 commit("testbranch", "right 4b")
 right_4 = base_revision()
 
 check(mtn("show_conflicts", left_4, right_4), 0, nil, true)
 check(samelines("stderr",
-{"mtn: [left]     0745f9674d3e615b29cdb30ffe6e3c6a1db55915",
- "mtn: [right]    682e750ea71b77bcbbcdf33b6fc7cfa0516766f8",
- "mtn: [ancestor] c8bb2e0efd5e055beea0299c9beecffece46cb4a",
- "mtn: conflict: file 'file_12' from revision c8bb2e0efd5e055beea0299c9beecffece46cb4a",
+{"mtn: [left]     " .. left_4,
+ "mtn: [right]    " .. right_4,
+ "mtn: [ancestor] " .. base_4,
+ "mtn: conflict: file 'file_12'",
  "mtn: modified on the left, named file_12",
  "mtn: dropped and recreated on the right",
- "mtn: conflict: file 'file_13' from revision c8bb2e0efd5e055beea0299c9beecffece46cb4a",
+ "mtn: conflict: file 'file_13'",
  "mtn: dropped and recreated on the left",
  "mtn: modified on the right, named file_13",
- "mtn: 2 conflicts with supported resolutions."}))
+ "mtn: conflict: file 'file_14'",
+ "mtn: modified on the left, named file_14",
+ "mtn: dropped and recreated on the right",
+ "mtn: conflict: file 'file_15'",
+ "mtn: modified on the left, named file_15",
+ "mtn: dropped and recreated on the right",
+ "mtn: conflict: file 'file_16'",
+ "mtn: dropped and recreated on the left",
+ "mtn: modified on the right, named file_16",
+ "mtn: conflict: file 'file_17'",
+ "mtn: dropped and recreated on the left",
+ "mtn: modified on the right, named file_17",
+ "mtn: conflict: file 'file_18'",
+ "mtn: dropped and recreated on the left",
+ "mtn: modified on the right, named file_18",
+ "mtn: 7 conflicts with supported resolutions."}))
 
 check(mtn("conflicts", "store", left_4, right_4), 0, nil, true)
 check(samefilestd("conflicts-recreated", "_MTN/conflicts"))
@@ -404,21 +444,62 @@ check(mtn("conflicts", "resolve_first_ri
 check(mtn("conflicts", "resolve_first_left", "user", "_MTN/resolutions/file_13"), 0, nil, nil)
 check(mtn("conflicts", "resolve_first_right", "drop"), 0, nil, nil)
 
+check(mtn("conflicts", "resolve_first_left", "rename", "file_14_renamed"), 0, nil, nil)
+check(mtn("conflicts", "resolve_first_right", "keep"), 0, nil, nil)
+
+writefile("_MTN/resolutions/file_15_left", "file_15 user left")
+check(mtn("conflicts", "resolve_first_left", "user_rename", "_MTN/resolutions/file_15_left", "file_15_renamed_left"), 0, nil, nil)
+check(mtn("conflicts", "resolve_first_right", "rename", "file_15_renamed_right"), 0, nil, nil)
+
+check(mtn("conflicts", "resolve_first_left", "drop"), 0, nil, nil)
+check(mtn("conflicts", "resolve_first_right", "rename", "file_16_renamed"), 0, nil, nil)
+
+check(mtn("conflicts", "resolve_first_left", "rename", "file_17_renamed"), 0, nil, nil)
+check(mtn("conflicts", "resolve_first_right", "drop"), 0, nil, nil)
+
+mkdir("_MTN")
+mkdir("_MTN/resolutions")
+writefile("_MTN/resolutions/file_18", "file_18 user")
+check(mtn("conflicts", "resolve_first_left", "user_rename", "_MTN/resolutions/file_18", "file_18_renamed"), 0, nil, nil)
+check(mtn("conflicts", "resolve_first_right", "drop"), 0, nil, nil)
+
 check(samefilestd("conflicts-recreated-resolved", "_MTN/conflicts"))
 
 check(mtn("explicit_merge", "--resolve-conflicts", left_4, right_4, "testbranch"), 0, nil, true)
 check(samelines("stderr",
-{"mtn: [left]  0745f9674d3e615b29cdb30ffe6e3c6a1db55915",
- "mtn: [right] 682e750ea71b77bcbbcdf33b6fc7cfa0516766f8",
+{"mtn: [left]  " .. left_4,
+ "mtn: [right] " .. right_4,
  "mtn: keeping 'file_12' from left",
  "mtn: history for 'file_12' from left will be lost; see user manual Merge Conflicts section",
  "mtn: dropping 'file_12' from right",
  "mtn: replacing content of 'file_13' from left with '_MTN/resolutions/file_13'",
  "mtn: dropping 'file_13' from right",
- "mtn: [merged] 21f4b2cfb7386246e682c4a862cffeb77a435c1a"}))
+ "mtn: renaming 'file_14' from left to 'file_14_renamed'",
+ "mtn: history for 'file_14' from left will be lost; see user manual Merge Conflicts section",
+ "mtn: keeping 'file_14' from right",
+ "mtn: replacing content of 'file_15' from left with '_MTN/resolutions/file_15_left'",
+ "mtn: history for 'file_15' from left will be lost; see user manual Merge Conflicts section",
+ "mtn: renaming 'file_15' from left to 'file_15_renamed_left'",
+ "mtn: renaming 'file_15' from right to 'file_15_renamed_right'",
+ "mtn: dropping 'file_16' from left",
+ "mtn: renaming 'file_16' from right to 'file_16_renamed'",
+ "mtn: history for 'file_16' from right will be lost; see user manual Merge Conflicts section",
+ "mtn: renaming 'file_17' from left to 'file_17_renamed'",
+ "mtn: dropping 'file_17' from right",
+ "mtn: replacing content of 'file_18' from left with '_MTN/resolutions/file_18'",
+ "mtn: renaming 'file_18' from left to 'file_18_renamed'",
+ "mtn: dropping 'file_18' from right",
+ "mtn: [merged] c6d6dba528110b6aa32572f6939982a1d56b17e0"}))
 
 check(mtn("update"), 0, nil, true)
 check(samelines("file_12", {"file_12 left"}))
 check(samelines("file_13", {"file_13 user"}))
+check(samelines("file_14_renamed", {"file_14 left"}))
+check(samelines("file_14", {"file_14 right re-add"}))
+check(samelines("file_15_renamed_left", {"file_15 user left"}))
+check(samelines("file_15_renamed_right", {"file_15 right re-add"}))
+check(samelines("file_16_renamed", {"file_16 right"}))
+check(samelines("file_17_renamed", {"file_17 left re-add"}))
+check(samelines("file_18_renamed", {"file_18 user"}))
 
 -- end of file
============================================================
--- test/func/resolve_conflicts_dropped_modified_1/conflicts-recreated	826d98ed030373bb9b0b778c1a1da792b8f4009a
+++ test/func/resolve_conflicts_dropped_modified_1/conflicts-recreated	3f43d9d13d0149e3be0fa3a7a8695182dbc871ea
@@ -1,6 +1,6 @@
-    left [0745f9674d3e615b29cdb30ffe6e3c6a1db55915]
-   right [682e750ea71b77bcbbcdf33b6fc7cfa0516766f8]
-ancestor [c8bb2e0efd5e055beea0299c9beecffece46cb4a]
+    left [3721cc38b4f98b571d92bd38b2e269f438ed0af8]
+   right [ad9ca7cb1f77fe829269d4ac18763bfb9683a4b0]
+ancestor [a2b0bdd41b1b94e6e580c81c9901af128d299a7f]
 
         conflict dropped_modified
    ancestor_name "file_12"
@@ -21,3 +21,53 @@ ancestor_file_id [833044cd7f5458fe436ddb
       right_type "modified file"
       right_name "file_13"
    right_file_id [6aaa91015c6fc3b0dc8eeccf2aa22c52fe8dba2a]
+
+        conflict dropped_modified
+   ancestor_name "file_14"
+ancestor_file_id [0e462cd7a936807265ce7c01ce040b79aa2fa4d1]
+       left_type "modified file"
+       left_name "file_14"
+    left_file_id [442ddb4cae7d5cde84983dd60597c966e87645ea]
+      right_type "recreated file"
+      right_name "file_14"
+   right_file_id [963b47ce0f243cbd38b1ae288e6c6d559006ba6b]
+
+        conflict dropped_modified
+   ancestor_name "file_15"
+ancestor_file_id [13afe431eae6774a3b14ce8a2a6c2583ba375383]
+       left_type "modified file"
+       left_name "file_15"
+    left_file_id [8c1962f213226e85231b7b91b1a368f8e2ad8bf4]
+      right_type "recreated file"
+      right_name "file_15"
+   right_file_id [4d28d9df37261e18c1c23108c2ab531b8e535193]
+
+        conflict dropped_modified
+   ancestor_name "file_16"
+ancestor_file_id [b7de9cb0feb57657abcc6a991fdc7d034bfe2e66]
+       left_type "recreated file"
+       left_name "file_16"
+    left_file_id [7a8bca4a66301d480279b187927dcacba4da9f39]
+      right_type "modified file"
+      right_name "file_16"
+   right_file_id [e9d80dfb12b60107455fdf42fcc6beecb33fa7bd]
+
+        conflict dropped_modified
+   ancestor_name "file_17"
+ancestor_file_id [36158b32ea4ca5cbeba77374c9f407adeee91930]
+       left_type "recreated file"
+       left_name "file_17"
+    left_file_id [b5143f8996e5383113d406f263896a75f211e208]
+      right_type "modified file"
+      right_name "file_17"
+   right_file_id [5b5069994101a5bd4f35c9a9eaaf78abdf8e52ee]
+
+        conflict dropped_modified
+   ancestor_name "file_18"
+ancestor_file_id [4d70c0b068124556ad0e2d4f17b2d5994eaf01f5]
+       left_type "recreated file"
+       left_name "file_18"
+    left_file_id [3c2034c53b1882fd16fd943c80a93074932fc220]
+      right_type "modified file"
+      right_name "file_18"
+   right_file_id [c7ef23c4c1ad7b8c977a1caeb9a5830fd1fa1ae7]
============================================================
--- test/func/resolve_conflicts_dropped_modified_1/conflicts-recreated-resolved	096988d5f8102507e0e2783f7a6954512a167da5
+++ test/func/resolve_conflicts_dropped_modified_1/conflicts-recreated-resolved	7937832db9408aeadbbeed472d86f29ef3394a06
@@ -1,6 +1,6 @@
-    left [0745f9674d3e615b29cdb30ffe6e3c6a1db55915]
-   right [682e750ea71b77bcbbcdf33b6fc7cfa0516766f8]
-ancestor [c8bb2e0efd5e055beea0299c9beecffece46cb4a]
+    left [3721cc38b4f98b571d92bd38b2e269f438ed0af8]
+   right [ad9ca7cb1f77fe829269d4ac18763bfb9683a4b0]
+ancestor [a2b0bdd41b1b94e6e580c81c9901af128d299a7f]
 
            conflict dropped_modified
       ancestor_name "file_12"
@@ -25,3 +25,65 @@ resolved_drop_right 
       right_file_id [6aaa91015c6fc3b0dc8eeccf2aa22c52fe8dba2a]
  resolved_user_left "_MTN/resolutions/file_13"
 resolved_drop_right 
+
+            conflict dropped_modified
+       ancestor_name "file_14"
+    ancestor_file_id [0e462cd7a936807265ce7c01ce040b79aa2fa4d1]
+           left_type "modified file"
+           left_name "file_14"
+        left_file_id [442ddb4cae7d5cde84983dd60597c966e87645ea]
+          right_type "recreated file"
+          right_name "file_14"
+       right_file_id [963b47ce0f243cbd38b1ae288e6c6d559006ba6b]
+resolved_rename_left "file_14_renamed"
+ resolved_keep_right 
+
+             conflict dropped_modified
+        ancestor_name "file_15"
+     ancestor_file_id [13afe431eae6774a3b14ce8a2a6c2583ba375383]
+            left_type "modified file"
+            left_name "file_15"
+         left_file_id [8c1962f213226e85231b7b91b1a368f8e2ad8bf4]
+           right_type "recreated file"
+           right_name "file_15"
+        right_file_id [4d28d9df37261e18c1c23108c2ab531b8e535193]
+   resolved_user_left "_MTN/resolutions/file_15_left"
+ resolved_rename_left "file_15_renamed_left"
+resolved_rename_right "file_15_renamed_right"
+
+             conflict dropped_modified
+        ancestor_name "file_16"
+     ancestor_file_id [b7de9cb0feb57657abcc6a991fdc7d034bfe2e66]
+            left_type "recreated file"
+            left_name "file_16"
+         left_file_id [7a8bca4a66301d480279b187927dcacba4da9f39]
+           right_type "modified file"
+           right_name "file_16"
+        right_file_id [e9d80dfb12b60107455fdf42fcc6beecb33fa7bd]
+   resolved_drop_left 
+resolved_rename_right "file_16_renamed"
+
+            conflict dropped_modified
+       ancestor_name "file_17"
+    ancestor_file_id [36158b32ea4ca5cbeba77374c9f407adeee91930]
+           left_type "recreated file"
+           left_name "file_17"
+        left_file_id [b5143f8996e5383113d406f263896a75f211e208]
+          right_type "modified file"
+          right_name "file_17"
+       right_file_id [5b5069994101a5bd4f35c9a9eaaf78abdf8e52ee]
+resolved_rename_left "file_17_renamed"
+ resolved_drop_right 
+
+            conflict dropped_modified
+       ancestor_name "file_18"
+    ancestor_file_id [4d70c0b068124556ad0e2d4f17b2d5994eaf01f5]
+           left_type "recreated file"
+           left_name "file_18"
+        left_file_id [3c2034c53b1882fd16fd943c80a93074932fc220]
+          right_type "modified file"
+          right_name "file_18"
+       right_file_id [c7ef23c4c1ad7b8c977a1caeb9a5830fd1fa1ae7]
+  resolved_user_left "_MTN/resolutions/file_18"
+resolved_rename_left "file_18_renamed"
+ resolved_drop_right 
============================================================
--- test/func/resolve_conflicts_dropped_modified_1/show_conflicts	74f0f311dee5ce970396bed354b6ab0fd97077f0
+++ test/func/resolve_conflicts_dropped_modified_1/show_conflicts	cce385ec522c8e4885cac7d3375896aaa507f0e0
@@ -1,22 +1,22 @@ mtn: [ancestor] c2fe3623ce72d248154425dc
 mtn: [left]     7b2ef4343b0717bcd122498a1a0b7ff7acffb64c
 mtn: [right]    ca7922b510f9daf5c4b28c6788315ee82eb9a7f0
 mtn: [ancestor] c2fe3623ce72d248154425dc7db2ddcc397c9aca
-mtn: conflict: file 'file_2' from revision c2fe3623ce72d248154425dc7db2ddcc397c9aca
+mtn: conflict: file 'file_2'
 mtn: modified on the left, named file_2_renamed
 mtn: dropped on the right
-mtn: conflict: file 'file_3' from revision c2fe3623ce72d248154425dc7db2ddcc397c9aca
+mtn: conflict: file 'file_3'
 mtn: dropped on the left
 mtn: modified on the right, named file_3_renamed
-mtn: conflict: file 'file_4' from revision c2fe3623ce72d248154425dc7db2ddcc397c9aca
+mtn: conflict: file 'file_4'
 mtn: modified on the left, named file_4
 mtn: dropped on the right
-mtn: conflict: file 'file_5' from revision c2fe3623ce72d248154425dc7db2ddcc397c9aca
+mtn: conflict: file 'file_5'
 mtn: dropped on the left
 mtn: modified on the right, named file_5
-mtn: conflict: file 'file_6' from revision c2fe3623ce72d248154425dc7db2ddcc397c9aca
+mtn: conflict: file 'file_6'
 mtn: modified on the left, named file_6_renamed
 mtn: dropped on the right
-mtn: conflict: file 'file_7' from revision c2fe3623ce72d248154425dc7db2ddcc397c9aca
+mtn: conflict: file 'file_7'
 mtn: dropped on the left
 mtn: modified on the right, named file_7_renamed
 mtn: 6 conflicts with supported resolutions.
============================================================
--- test/func/resolve_conflicts_dropped_modified_1/show_conflicts-orphaned	fbe2c5cc2c59c6fec1121e3be9469d370b9ed5cb
+++ test/func/resolve_conflicts_dropped_modified_1/show_conflicts-orphaned	e343653ac3989164acb2dbb54f3f97b035d28de6
@@ -1,13 +1,13 @@ mtn: [ancestor] 44c4d408ecf65b6b45fa2c6f
 mtn: [left]     4228fbd8003cdd89e7eea51fcef10c3f91d78f69
 mtn: [right]    6cb6438a490a1ad4c69ff6cac23c75a903cd9cfd
 mtn: [ancestor] 44c4d408ecf65b6b45fa2c6fa2a51e5b7485d8e1
-mtn: conflict: file 'dir2/file_10' from revision 44c4d408ecf65b6b45fa2c6fa2a51e5b7485d8e1
+mtn: conflict: file 'dir2/file_10'
 mtn: modified on the left, named dir2/file_10
 mtn: orphaned on the right
-mtn: conflict: file 'dir2/file_11' from revision 44c4d408ecf65b6b45fa2c6fa2a51e5b7485d8e1
+mtn: conflict: file 'dir2/file_11'
 mtn: modified on the left, named dir2/file_11
 mtn: orphaned on the right
-mtn: conflict: file 'dir2/file_9' from revision 44c4d408ecf65b6b45fa2c6fa2a51e5b7485d8e1
+mtn: conflict: file 'dir2/file_9'
 mtn: modified on the left, named dir2/file_9
 mtn: orphaned on the right
 mtn: 3 conflicts with supported resolutions.
============================================================
--- test/func/resolve_conflicts_dropped_modified_2/__driver__.lua	5595825e6da1a21e03d0ff0aab288d27755df0a7
+++ test/func/resolve_conflicts_dropped_modified_2/__driver__.lua	81b11d9ab24ad470156b95e8be8efd9dc1645156
@@ -34,7 +34,7 @@ check(samelines("stderr",
  {"mtn: [left]     506d8ed51b06c0080e8bb307155a88637045b532",
   "mtn: [right]    a2889488ed1801a904d0219ec9939dfc2e9be033",
   "mtn: [ancestor] f80ff103551d0313647d6c84990bc9db6b158dac",
-  "mtn: conflict: file 'file_2' from revision f80ff103551d0313647d6c84990bc9db6b158dac",
+  "mtn: conflict: file 'file_2'",
   "mtn: modified on the left, named file_2",
   "mtn: dropped on the right",
   "mtn: 1 conflict with supported resolutions."}))
@@ -69,7 +69,7 @@ check(samelines("stderr",
  {"mtn: [left]     5a144a43f03692e389f3ddd4c510a4d9754061d5",
   "mtn: [right]    3df3126220588440def7b08f488ca35eaa94f1b6",
   "mtn: [ancestor] 506d8ed51b06c0080e8bb307155a88637045b532",
-  "mtn: conflict: file 'file_2' from revision 506d8ed51b06c0080e8bb307155a88637045b532",
+  "mtn: conflict: file 'file_2'",
   "mtn: modified on the left, named file_2",
   "mtn: dropped and recreated on the right",
   "mtn: 1 conflict with supported resolutions."}))
============================================================
--- test/func/resolve_conflicts_dropped_modified_upstream_vs_local_2/__driver__.lua	f1d2d4f0ba195e43ee31e57f42a9396971656833
+++ test/func/resolve_conflicts_dropped_modified_upstream_vs_local_2/__driver__.lua	44b9528be152a46e15ddfcd5947dce86f13b76a8
@@ -82,7 +82,7 @@ check(samelines("stderr",
  {"mtn: [left]     48b18ebc7b70733133539384e49a2eedb82e32b2",
   "mtn: [right]    650057e8a81bd41991dc5ff10b2d60343f1032ae",
   "mtn: [ancestor] 27d41ae9f2b3cb73b130d9845d77574a11021b17",
-  "mtn: conflict: file 'file_2' from revision 27d41ae9f2b3cb73b130d9845d77574a11021b17",
+  "mtn: conflict: file 'file_2'",
   "mtn: modified on the left, named file_2",
   "mtn: dropped and recreated on the right",
   "mtn: 1 conflict with supported resolutions."}))
============================================================
--- test/func/resolve_conflicts_dropped_modified_upstream_vs_local_attr/__driver__.lua	5ca6fd173e372916aa7d3e29f902a1837825a497
+++ test/func/resolve_conflicts_dropped_modified_upstream_vs_local_attr/__driver__.lua	abe2836cc2dfbae368820e3b5515ad587911c71b
@@ -34,7 +34,7 @@ check(samelines("stderr",
  {"mtn: [left]     1e700864de7a2cbb1cf85c26f5e1e4ca335d2bc2",
   "mtn: [right]    a2889488ed1801a904d0219ec9939dfc2e9be033",
   "mtn: [ancestor] f80ff103551d0313647d6c84990bc9db6b158dac",
-  "mtn: conflict: file 'file_2' from revision f80ff103551d0313647d6c84990bc9db6b158dac",
+  "mtn: conflict: file 'file_2'",
   "mtn: modified on the left, named file_2",
   "mtn: dropped on the right",
   "mtn: 1 conflict with supported resolutions."}))
@@ -86,7 +86,7 @@ check(samelines("stderr",
  {"mtn: [left]     c0ed8c29ffad149af1c948969e8e80d270999b13",
   "mtn: [right]    dd1ba606b52fddb4431da3760ff65b65f6509a48",
   "mtn: [ancestor] 1e700864de7a2cbb1cf85c26f5e1e4ca335d2bc2",
-  "mtn: conflict: file 'file_2' from revision 1e700864de7a2cbb1cf85c26f5e1e4ca335d2bc2",
+  "mtn: conflict: file 'file_2'",
   "mtn: modified on the left, named file_2",
   "mtn: dropped on the right",
   "mtn: left_resolution: drop",
@@ -98,5 +98,11 @@ check(samefilestd("conflicts", "_MTN/con
 check(mtn("conflicts", "store", upstream_2, local_2), 0, nil, true)
 check(samefilestd("conflicts", "_MTN/conflicts"))
 
--- FIXME: repeat merge with left, right swapped
+-- repeat merge with left, right swapped to verify symmetry in code
+remove("_MTN/conflicts")
+check(mtn("explicit_merge", "--resolve-conflicts", local_2, upstream_2, "testbranch"), 0, nil, true)
+check(qgrep("mtn: dropping 'file_2' from right", "stderr"))
+check(mtn("update"), 0, nil, true)
+check(not exists("file_2"))
+
 -- end of file
============================================================
--- test/func/resolve_conflicts_orphaned_file/__driver__.lua	5c2b5eb76fd3a1e97da6e549443037dc0698e17d
+++ test/func/resolve_conflicts_orphaned_file/__driver__.lua	beb41b901c1e08bbef25e87fe0b2ef36e74a2a8b
@@ -1,5 +1,4 @@
 -- Test resolving orphaned_file and orphaned_directory conflicts
--- FIXME: swap left, right
 mtn_setup()
 
 addfile("foo", "foo base")