Wed, 16 Aug 2006 10:52:42 -0700 |
Vadim Gelfer |
override previous merge with mpm.
|
changeset |
files
|
Wed, 16 Aug 2006 10:52:19 -0700 |
Vadim Gelfer |
redo merge with mpm.
|
changeset |
files
|
Wed, 16 Aug 2006 10:46:24 -0700 |
Vadim Gelfer |
merge with mpm.
|
changeset |
files
|
Tue, 15 Aug 2006 23:17:06 -0500 |
Matt Mackall |
merge: consolidate dirstate updates
|
changeset |
files
|
Tue, 15 Aug 2006 22:46:35 -0500 |
Matt Mackall |
merge: use file size stored in revlog index
|
changeset |
files
|
Tue, 15 Aug 2006 18:30:21 -0500 |
Matt Mackall |
merge: move forgets to the apply stage
|
changeset |
files
|
Tue, 15 Aug 2006 18:12:36 -0500 |
Matt Mackall |
trivial bool() cleanup
|
changeset |
files
|
Tue, 15 Aug 2006 16:28:00 -0500 |
Matt Mackall |
filelog.cmp: return 0 for equality
|
changeset |
files
|
Tue, 15 Aug 2006 16:27:19 -0500 |
Matt Mackall |
merge: hoist some working manifest logic out of merge loop
|
changeset |
files
|
Tue, 15 Aug 2006 16:12:51 -0500 |
Matt Mackall |
merge: working manifest new/changed
|
changeset |
files
|
Tue, 15 Aug 2006 15:58:10 -0500 |
Matt Mackall |
merge: factor out exec bit merge function
|
changeset |
files
|
Tue, 15 Aug 2006 15:45:45 -0500 |
Matt Mackall |
Use revlog hash comparison technique in merge
|
changeset |
files
|
Tue, 15 Aug 2006 14:18:13 -0500 |
Matt Mackall |
Move cmp bits from filelog to revlog
|
changeset |
files
|
Tue, 15 Aug 2006 14:06:50 -0500 |
Matt Mackall |
Move ui.sendmail to mail.connect/sendmail
|
changeset |
files
|
Tue, 15 Aug 2006 11:34:08 -0500 |
Matt Mackall |
Move ui.diffopts to patch.diffopts where it belongs
|
changeset |
files
|
Tue, 15 Aug 2006 11:28:50 -0700 |
Brendan Cully |
Unify mq and hg patch invocation.
|
changeset |
files
|
Tue, 15 Aug 2006 11:43:31 -0700 |
Vadim Gelfer |
merge.
|
changeset |
files
|
Tue, 15 Aug 2006 11:42:50 -0700 |
Vadim Gelfer |
make test-mq-qdiff executable.
|
changeset |
files
|
Tue, 15 Aug 2006 20:59:55 +0300 |
Giorgos Keramidas |
tests: new test for mq qdiff command
|
changeset |
files
|
Tue, 15 Aug 2006 11:38:07 -0700 |
Vadim Gelfer |
merge with other head by default, not tip.
|
changeset |
files
|
Tue, 15 Aug 2006 09:37:58 -0700 |
Vadim Gelfer |
merge with mpm.
|
changeset |
files
|
Tue, 15 Aug 2006 18:14:58 +0300 |
Giorgos Keramidas |
Tune a bit the extdiff toplevel comments/samples.
|
changeset |
files
|
Mon, 14 Aug 2006 15:07:00 -0500 |
Matt Mackall |
filelog: add hash-based comparisons
|
changeset |
files
|
Mon, 14 Aug 2006 14:42:15 -0500 |
Matt Mackall |
Merge with crew
|
changeset |
files
|