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
|
Tue, 15 Aug 2006 14:18:13 -0500 |
Matt Mackall |
Move cmp bits from filelog to revlog
|