#
#
# patch "roster_merge.cc"
#  from [e5b2f94ce37b39be453c5075e3af9590d9ddbbfa]
#    to [38310c3334a032431c419f29375968dc49f8b909]
# 
# patch "tests/non_content_conflicts/__driver__.lua"
#  from [c128077440ef891c3a4cf192b57021f16f79e87a]
#    to [ea7f40d87db00714e0132b5861a6ab4d2bd0dbf4]
#
============================================================
--- roster_merge.cc	e5b2f94ce37b39be453c5075e3af9590d9ddbbfa
+++ roster_merge.cc	38310c3334a032431c419f29375968dc49f8b909
@@ -271,8 +271,9 @@ roster_merge_result::warn_non_content_co
   for (size_t i = 0; i < convergent_name_conflicts.size(); ++i)
     {
       file_path left_name, right_name;
-      left.get_name(convergent_name_conflicts[i].nid2, left_name);
-      right.get_name(convergent_name_conflicts[i].nid1, right_name);
+      // FIXME: ensure nid1 is always left and nid2 is always right
+      left.get_name(convergent_name_conflicts[i].nid1, left_name);
+      right.get_name(convergent_name_conflicts[i].nid2, right_name);
 
       I(left_name == right_name);
 
============================================================
--- tests/non_content_conflicts/__driver__.lua	c128077440ef891c3a4cf192b57021f16f79e87a
+++ tests/non_content_conflicts/__driver__.lua	ea7f40d87db00714e0132b5861a6ab4d2bd0dbf4
@@ -8,16 +8,16 @@ check(mtn("setup", ".", "--branch", "div
 remove("_MTN")
 check(mtn("setup", ".", "--branch", "divergent"), 0, false, false)
 
-addfile("foo", "divergent")
+addfile("foo", "divergent foo")
 commit("divergent")
 base = base_revision()
 
-check(mtn("mv", "foo", "left"), 0, false, false)
+check(mtn("mv", "foo", "bar"), 0, false, false)
 commit("divergent")
 
 revert_to(base)
 
-check(mtn("mv", "foo", "right"), 0, false, false)
+check(mtn("mv", "foo", "baz"), 0, false, false)
 commit("divergent")
 
 check(mtn("merge", "--branch", "divergent"), 1, false, true)
@@ -28,16 +28,16 @@ check(mtn("setup", ".", "--branch", "con
 remove("_MTN")
 check(mtn("setup", ".", "--branch", "convergent"), 0, false, false)
 
-addfile("foo", "convergent")
+addfile("foo", "convergent foo")
 commit("convergent")
 base = base_revision()
 
-addfile("bar", "foobar")
+addfile("bar", "convergent bar1")
 commit("convergent")
 
 revert_to(base)
 
-addfile("bar", "barfoo")
+addfile("bar", "convergent bar2")
 commit("convergent")
 
 check(mtn("merge", "--branch", "convergent"), 1, false, true)
@@ -77,16 +77,16 @@ mkdir("foo")
 remove("bar")
 
 mkdir("foo")
-addfile("foo/foo", "foofoo")
+addfile("foo/foo", "orphan foofoo")
 commit("orphan")
 
 base = base_revision()
 
-addfile("foo/bar", "foobar")
-addfile("foo/baz", "foobaz")
+addfile("foo/bar", "orphan foobar")
+addfile("foo/baz", "orphan foobaz")
 mkdir("foo/sub")
-addfile("foo/sub/bar", "foosubbar")
-addfile("foo/sub/baz", "foosubbaz")
+addfile("foo/sub/bar", "orphan foosubbar")
+addfile("foo/sub/baz", "orphan foosubbaz")
 
 commit("orphan")
 
@@ -105,7 +105,7 @@ mkdir("foo")
 check(mtn("setup", ".", "--branch", "illegal"), 0, false, false)
 
 mkdir("foo")
-addfile("foo/foo", "foofoo")
+addfile("foo/foo", "illegal foofoo")
 commit("illegal")
 
 base = base_revision()
@@ -115,8 +115,8 @@ mkdir("foo/_MTN")
 check(indir("illegal", mtn("commit", "--message", "commit")), 0, false, false)
 
 mkdir("foo/_MTN")
-addfile("foo/_MTN/foo", "foofoo")
-addfile("foo/_MTN/bar", "foobar")
+addfile("foo/_MTN/foo", "illegal foo")
+addfile("foo/_MTN/bar", "illegal bar")
 commit("illegal")
 
 check(mtn("merge", "--branch", "illegal"), 1, false, true)
@@ -128,7 +128,7 @@ mkdir("foo")
 check(mtn("setup", ".", "--branch", "missing"), 0, false, false)
 
 mkdir("foo")
-addfile("foo/foo", "foofoo")
+addfile("foo/foo", "missing foofoo")
 commit("missing")
 
 base = base_revision()
@@ -150,7 +150,7 @@ remove("foo")
 check(mtn("setup", ".", "--branch", "attribute"), 0, false, false)
 remove("foo")
 
-addfile("foo", "attribute")
+addfile("foo", "attribute foo")
 check(mtn("attr", "set", "foo", "attr1", "value1"), 0, false, false)
 check(mtn("attr", "set", "foo", "attr2", "value2"), 0, false, false)
 commit("attribute")