Mon, 09 Oct 2006 21:48:44 +0200 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 09 Oct 2006 21:48:44 +0200] rev 3298
extend test-flags
Mon, 09 Oct 2006 21:22:55 +0200 merge with upstream
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 09 Oct 2006 21:22:55 +0200] rev 3297
merge with upstream
Sun, 08 Oct 2006 20:18:59 -0500 Use filelog.cmp in checkfilemerge
Matt Mackall <mpm@selenic.com> [Sun, 08 Oct 2006 20:18:59 -0500] rev 3296
Use filelog.cmp in checkfilemerge
Sun, 08 Oct 2006 19:57:45 -0500 merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com> [Sun, 08 Oct 2006 19:57:45 -0500] rev 3295
merge: remember rename copies and parents properly on commit record copies in dirstate even if rename was remote this lets us record it properly at commit teach checkfilemerge about copies, including merge cases pull old copy code out of commit extend rename-merge1 test to show file index
(0) -3000 -1000 -300 -100 -30 -10 -4 +4 +10 +30 +100 +300 +1000 tip