| Wed, 16 Aug 2006 10:53:01 -0700 |
Vadim Gelfer |
make new tests executable.
|
| Tue, 15 Aug 2006 21:49:49 +0300 |
Giorgos Keramidas |
tests: new test for the bisect extension
|
| Tue, 15 Aug 2006 21:22:26 +0300 |
Giorgos Keramidas |
tests: new test for "hg annotate"
|
| Wed, 16 Aug 2006 10:52:42 -0700 |
Vadim Gelfer |
override previous merge with mpm.
|
| Wed, 16 Aug 2006 10:52:19 -0700 |
Vadim Gelfer |
redo merge with mpm.
|
| Wed, 16 Aug 2006 10:46:24 -0700 |
Vadim Gelfer |
merge with mpm.
|
| Tue, 15 Aug 2006 23:17:06 -0500 |
Matt Mackall |
merge: consolidate dirstate updates
|
| Tue, 15 Aug 2006 22:46:35 -0500 |
Matt Mackall |
merge: use file size stored in revlog index
|
| Tue, 15 Aug 2006 18:30:21 -0500 |
Matt Mackall |
merge: move forgets to the apply stage
|
| Tue, 15 Aug 2006 18:12:36 -0500 |
Matt Mackall |
trivial bool() cleanup
|
| Tue, 15 Aug 2006 16:28:00 -0500 |
Matt Mackall |
filelog.cmp: return 0 for equality
|
| Tue, 15 Aug 2006 16:27:19 -0500 |
Matt Mackall |
merge: hoist some working manifest logic out of merge loop
|
| Tue, 15 Aug 2006 16:12:51 -0500 |
Matt Mackall |
merge: working manifest new/changed
|
| Tue, 15 Aug 2006 15:58:10 -0500 |
Matt Mackall |
merge: factor out exec bit merge function
|
| Tue, 15 Aug 2006 15:45:45 -0500 |
Matt Mackall |
Use revlog hash comparison technique in merge
|
