merge: remember rename copies and parents properly on commit
record copies in dirstate even if rename was remote
this lets us record it properly at commit
teach checkfilemerge about copies, including merge cases
pull old copy code out of commit
extend rename-merge1 test to show file index
adding base
abort: cannot delete applied patch c
Now at: b
a
b
a
b
series
status
Now at: a
a
b
series
status
1 New patch: a
0 base
abort: patch e not at base
f
4 New patch: f
3 New patch: e
2 New patch: d
1 New patch: a
0 base