Thomas Arendsen Hein <thomas@intevation.de> [Fri, 01 Dec 2006 23:16:12 +0100] rev 3754
Improve error message for unknown revlog flags.
Old: unknown flags 120000 for ...
New: unknown flags 0x0012 for ...
Brendan Cully <brendan@kublai.com> [Fri, 01 Dec 2006 13:54:47 -0800] rev 3753
Merge with crew
Brendan Cully <brendan@kublai.com> [Fri, 01 Dec 2006 13:50:09 -0800] rev 3752
transplant: "filtering %s\n"
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 01 Dec 2006 22:29:47 +0100] rev 3751
Don't require a diff which accepts the -N option.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 01 Dec 2006 22:09:05 +0100] rev 3750
Compatibility fix for 'ln -sf'.
ln of Solaris 8 only accepts "ln -f -s" (in that order), but as the -f isn't
needed here, I simply dropped it.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 01 Dec 2006 16:18:16 -0200] rev 3749
additional fixes for
issue436
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 01 Dec 2006 15:40:23 +0100] rev 3748
Fix test-rename-dir-merge for different implementations of ls.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 01 Dec 2006 14:46:05 +0100] rev 3747
Fix test-notify for systems without or with a different version of diffstat.
Some diffstat versions say "1 file changed", others "1 files changed".
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 01 Dec 2006 13:11:09 +0100] rev 3746
merge with upstream
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 01 Dec 2006 09:42:07 +0100] rev 3745
Matt Mackall <mpm@selenic.com> [Fri, 01 Dec 2006 02:35:46 -0600] rev 3744
verify: add rename link checking
Matt Mackall <mpm@selenic.com> [Fri, 01 Dec 2006 02:24:56 -0600] rev 3743
Make revlog error slightly less scary
Matt Mackall <mpm@selenic.com> [Fri, 01 Dec 2006 01:42:52 -0600] rev 3742
Fix argument handling for hg -v pull -v x (issue 436)
Matt Mackall <mpm@selenic.com> [Fri, 01 Dec 2006 01:29:14 -0600] rev 3741
update bugzilla extension to use ui buffers
Matt Mackall <mpm@selenic.com> [Fri, 01 Dec 2006 01:29:13 -0600] rev 3740
add test for the notify extension
Matt Mackall <mpm@selenic.com> [Fri, 01 Dec 2006 01:28:20 -0600] rev 3739
fix notify with new ui buffering
Matt Mackall <mpm@selenic.com> [Fri, 01 Dec 2006 01:28:19 -0600] rev 3738
use ui buffering in changeset printer
delete old uibuffer class
delete old stringio class
move show to _show
add new show that uses ui.pushbuffer to buffer
add new flush that writes buffered data
add props arg to changeset_printer to match _templater
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