| Tue, 15 Aug 2006 11:38:07 -0700 |
Vadim Gelfer |
merge with other head by default, not tip.
|
| Tue, 15 Aug 2006 09:37:58 -0700 |
Vadim Gelfer |
merge with mpm.
|
| Tue, 15 Aug 2006 18:14:58 +0300 |
Giorgos Keramidas |
Tune a bit the extdiff toplevel comments/samples.
|
| Tue, 15 Aug 2006 16:04:47 +0200 |
Thomas Arendsen Hein |
Fixed test-extdiff.
|
| Tue, 15 Aug 2006 00:03:48 -0700 |
Brendan Cully |
A fix for --prune.
|
| Tue, 15 Aug 2006 11:47:17 +0200 |
Thomas Arendsen Hein |
Adjusted test to changed help output.
|
| Tue, 15 Aug 2006 11:22:29 +0200 |
Thomas Arendsen Hein |
merge with jeffpc
|
| Tue, 15 Aug 2006 05:12:27 -0400 |
Josef "Jeff" Sipek |
Use demandload in hgk
|
| Mon, 14 Aug 2006 22:48:03 -0700 |
Brendan Cully |
Add diff --git option
|
| Mon, 14 Aug 2006 15:51:35 -0700 |
Vadim Gelfer |
extdiff: fix bugs. add test.
|
| Mon, 14 Aug 2006 11:41:08 -0700 |
Brendan Cully |
Allow qdel to delete multiple patches.
|
| Mon, 14 Aug 2006 11:24:19 -0700 |
Brendan Cully |
Replace qdel/qfold -f option with -k/--keep.
|
| Mon, 14 Aug 2006 11:10:21 -0700 |
Brendan Cully |
Properly shell-quote arguments in extdiff
|
| Mon, 14 Aug 2006 11:07:15 -0700 |
Brendan Cully |
Update extdiff for recent refactoring
|
| Mon, 14 Aug 2006 10:27:02 -0700 |
Brendan Cully |
Test for log --prune.
|
| Mon, 14 Aug 2006 16:06:37 +0300 |
Giorgos Keramidas |
hgweb: partially revert 4ec58b157265
|
| 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
|
| Tue, 15 Aug 2006 14:06:50 -0500 |
Matt Mackall |
Move ui.sendmail to mail.connect/sendmail
|
| Tue, 15 Aug 2006 11:34:08 -0500 |
Matt Mackall |
Move ui.diffopts to patch.diffopts where it belongs
|
| Mon, 14 Aug 2006 15:07:00 -0500 |
Matt Mackall |
filelog: add hash-based comparisons
|
| Mon, 14 Aug 2006 14:42:15 -0500 |
Matt Mackall |
Merge with crew
|
