# # # patch "releases.xml" # from [b33409cfd0a3f977570b18979a277d997a193f80] # to [78a371d4e633c37cf7bbc99c08be7392e4f292a2] # ============================================================ --- releases.xml b33409cfd0a3f977570b18979a277d997a193f80 +++ releases.xml 78a371d4e633c37cf7bbc99c08be7392e4f292a2 @@ -77,7 +77,7 @@ unversioned files are moved to take an option '--move-conflicting-paths', to handle unversioned files that are blocking the action. The unversioned files are moved to -_MTN/resolutions/, so the action can +_MTN/resolutions/<workspace_path>, so the action can succeed, and the user can recover the files if necessary.
  • Resolution of orphaned file conflicts is now supported by @@ -867,7 +867,7 @@ Lua hooks.) ]]> - Fri, 25 Oct 2007 22:35:33 +0000 + Thu, 25 Oct 2007 22:35:33 +0000