#
#
# patch "tests/move_conflicting_unversioned/__driver__.lua"
#  from [4812b2d225cf999e363699ff409d9686f96e48b4]
#    to [0fcbb94092da77624ee6372d2938b9dd8a9dc102]
# 
# patch "work.cc"
#  from [c04b94b1c7d1e2687bcf4a3a1806f3d4bf1e4877]
#    to [64aebe522da583b53f2c3b32d6ee2dd6d01cead0]
#
============================================================
--- tests/move_conflicting_unversioned/__driver__.lua	4812b2d225cf999e363699ff409d9686f96e48b4
+++ tests/move_conflicting_unversioned/__driver__.lua	0fcbb94092da77624ee6372d2938b9dd8a9dc102
@@ -46,7 +46,7 @@ remove("_MTN/resolutions")
 
 remove("_MTN/resolutions")
 
---  Use case 2.
+--  Use case 2. Also with leftover _MTN/resolutions from some other use, such as conflict resolution
 revert_to(rev_one)
 check(mtn("drop", "somedir/fourthfile"), 0, nil, true)
 check(mtn("drop", "somedir/anotherfile"), 0, nil, true)
@@ -62,6 +62,9 @@ check(qgrep("cannot drop non-empty direc
 check(mtn("update"), 1, nil, true)
 check(qgrep("cannot drop non-empty directory", "stderr"))
 
+mkdir("_MTN/resolutions")
+writefile("_MTN/resolutions/conflicts", "conflict stuff")
+
 -- moves them out of the way
 check(mtn("update", "--move-conflicting-paths"), 0, nil, true)
 check(qgrep("moved conflicting", "stderr"))
============================================================
--- work.cc	c04b94b1c7d1e2687bcf4a3a1806f3d4bf1e4877
+++ work.cc	64aebe522da583b53f2c3b32d6ee2dd6d01cead0
@@ -1,3 +1,4 @@
+// Copyright (C) 2009 Stephen Leake <address@hidden>
 // Copyright (C) 2002 Graydon Hoare <address@hidden>
 //
 // This program is made available under the GNU GPL version 2.0 or
@@ -1345,9 +1346,6 @@ move_conflicting_paths_into_bookkeeping(
   // format for now().as_formatted_localtime would be simple and
   // probably adequate.
   bookkeeping_path leftover_path = bookkeeping_root / "resolutions";
-  require_path_is_nonexistent(leftover_path,
-                              F("cannot move conflicting paths - "
-                                "base path %s already exists") % leftover_path);
 
   mkdir_p(leftover_path);