Thu, 30 Nov 2006 22:38:48 -0600 make manifest friendlier
Matt Mackall <mpm@selenic.com> [Thu, 30 Nov 2006 22:38:48 -0600] rev 3736
make manifest friendlier switch to using context code ..which uses first parent by default show file hashes only with debug switch show permissions with verbose fix up tests
Thu, 30 Nov 2006 19:50:28 -0600 Add missing test output
Matt Mackall <mpm@selenic.com> [Thu, 30 Nov 2006 19:50:28 -0600] rev 3735
Add missing test output
Thu, 30 Nov 2006 18:22:44 -0600 Fix test permission
Matt Mackall <mpm@selenic.com> [Thu, 30 Nov 2006 18:22:44 -0600] rev 3734
Fix test permission
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
Thu, 30 Nov 2006 17:36:33 -0600 merge: add copied hash to simplify copy logic
Matt Mackall <mpm@selenic.com> [Thu, 30 Nov 2006 17:36:33 -0600] rev 3729
merge: add copied hash to simplify copy logic
Thu, 30 Nov 2006 17:36:33 -0600 merge: remove unused match logic from findcopies
Matt Mackall <mpm@selenic.com> [Thu, 30 Nov 2006 17:36:33 -0600] rev 3728
merge: remove unused match logic from findcopies
Thu, 30 Nov 2006 17:36:33 -0600 merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com> [Thu, 30 Nov 2006 17:36:33 -0600] rev 3727
merge: report destinations of moves in merge action messages
(0) -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 +30000 tip