Thu, 30 Nov 2006 17:36:33 -0600 merge: handle directory renames
Matt Mackall <mpm@selenic.com> [Thu, 30 Nov 2006 17:36:33 -0600] rev 3733
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
Thu, 30 Nov 2006 17:36:33 -0600 merge: pull findcopies helpers inside, refactor checkpair to checkcopies
Matt Mackall <mpm@selenic.com> [Thu, 30 Nov 2006 17:36:33 -0600] rev 3732
merge: pull findcopies helpers inside, refactor checkpair to checkcopies
Thu, 30 Nov 2006 17:36:33 -0600 merge: move check for empty ancestor into findcopies
Matt Mackall <mpm@selenic.com> [Thu, 30 Nov 2006 17:36:33 -0600] rev 3731
merge: move check for empty ancestor into findcopies
Thu, 30 Nov 2006 17:36:33 -0600 merge: only store one direction of copies in the copy map
Matt Mackall <mpm@selenic.com> [Thu, 30 Nov 2006 17:36:33 -0600] rev 3730
merge: only store one direction of copies in the copy map simplify checkpair generate copied hash from copy map make copy cases more symmetrical
(0) -3000 -1000 -300 -100 -30 -10 -4 +4 +10 +30 +100 +300 +1000 tip