Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 16 Aug 2006 10:53:01 -0700] rev 2925
make new tests executable.
Giorgos Keramidas <keramida@ceid.upatras.gr> [Tue, 15 Aug 2006 21:49:49 +0300] rev 2924
tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr> [Tue, 15 Aug 2006 21:22:26 +0300] rev 2923
tests: new test for "hg annotate"
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 16 Aug 2006 10:52:42 -0700] rev 2922
override previous merge with mpm.
merge at ef8ee4477019 was bad.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 16 Aug 2006 10:52:19 -0700] rev 2921
redo merge with mpm.
previous merge at ef8ee4477019 was bad.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 16 Aug 2006 10:46:24 -0700] rev 2920
merge with mpm.
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 23:17:06 -0500] rev 2919
merge: consolidate dirstate updates
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 22:46:35 -0500] rev 2918
merge: use file size stored in revlog index
Add size method to filelog to handle nodes with renames
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 18:30:21 -0500] rev 2917
merge: move forgets to the apply stage
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 18:12:36 -0500] rev 2916
trivial bool() cleanup
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 16:28:00 -0500] rev 2915
filelog.cmp: return 0 for equality
spotted by Alexis Carvalho
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 16:27:19 -0500] rev 2914
merge: hoist some working manifest logic out of merge loop