##// END OF EJS Templates
merge: handle directory renames...
merge: handle directory renames commit: handle new copy dirstate case correctly findcopies: keep a map of all copies found for directory logic add dirs filter check for merge:followdirs config option generate a directory move map find files that match directory move map manifestmerge: add directory rename cases applyupdates: skip actions with None file add "d" action recordupdates: add "d" action add simple directory rename test

File last commit:

r2958:ff3ea21a default
r3733:9e67fecb default
Show More
test-addremove.out
15 lines | 195 B | text/plain | TextLexer
adding dir/bar
adding foo
dir/bar
foo
adding dir/bar_2
adding foo_2
dir/bar_2
foo_2
adding a
adding c
adding b
adding d
removing a
removing c
recording removal of a as rename to b (100% similar)