Comments
Patch
@@ -442,7 +442,7 @@
"versions differ"))
elif n1: # file exists only on local side
if f in copied:
- pass # we'll deal with it on m2 side
+ actions['rm'].append((f, None, "remote moved away"))
elif f in movewithdir: # directory rename, move local
f2 = movewithdir[f]
actions['dm'].append((f2, (f, fl1),
@@ -478,8 +478,6 @@
actions['m'].append((f, (f2, f, f2, pa.node()),
"remote copied from " + f2))
else:
- actions['rm'].append((f2, None,
- "remote moved to " + f))
actions['m'].append((f, (f2, f, f2, pa.node()),
"remote moved from " + f2))
elif f not in ma: