Matt Mackall <mpm@selenic.com> [Fri, 01 Dec 2006 01:28:18 -0600] rev 3737
add a simple nested buffering scheme to ui
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
Matt Mackall <mpm@selenic.com> [Thu, 30 Nov 2006 19:50:28 -0600] rev 3735
Add missing test output
Matt Mackall <mpm@selenic.com> [Thu, 30 Nov 2006 18:22:44 -0600] rev 3734
Fix test permission
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
Matt Mackall <mpm@selenic.com> [Thu, 30 Nov 2006 17:36:33 -0600] rev 3732
merge: pull findcopies helpers inside, refactor checkpair to checkcopies
Matt Mackall <mpm@selenic.com> [Thu, 30 Nov 2006 17:36:33 -0600] rev 3731
merge: move check for empty ancestor into findcopies
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
Matt Mackall <mpm@selenic.com> [Thu, 30 Nov 2006 17:36:33 -0600] rev 3729
merge: add copied hash to simplify copy logic
Matt Mackall <mpm@selenic.com> [Thu, 30 Nov 2006 17:36:33 -0600] rev 3728
merge: remove unused match logic from findcopies
Matt Mackall <mpm@selenic.com> [Thu, 30 Nov 2006 17:36:33 -0600] rev 3727
merge: report destinations of moves in merge action messages
Brendan Cully <brendan@kublai.com> [Thu, 30 Nov 2006 13:51:58 -0800] rev 3726
transplant: recover added/removed files after failed application