Sun, 29 Apr 2007 17:35:03 -0700 |
Brendan Cully |
Flesh out bisect help text
|
Sun, 29 Apr 2007 12:33:24 -0500 |
Matt Mackall |
Merge with crew
|
Sat, 28 Apr 2007 17:55:45 -0300 |
Alexis S. L. Carvalho |
Fix minor mismerge.
|
Sat, 28 Apr 2007 17:55:45 -0300 |
Alexis S. L. Carvalho |
run-tests.py: pass -L/--label to simplemerge
|
Thu, 26 Apr 2007 23:58:18 -0700 |
Lee Cantey |
Add notes about configuring a merge program
|
Fri, 27 Apr 2007 16:04:17 -0700 |
Lee Cantey |
Update copyright year and change to range
|
Sat, 28 Apr 2007 11:53:36 +0200 |
Patrick Mezard |
Use patch.patch() when checking for patch availability.
|
Sat, 28 Apr 2007 09:03:47 -0700 |
Brendan Cully |
Merge with crew
|
Sat, 28 Apr 2007 11:43:31 +0200 |
Patrick Mezard |
Fix find_in_path not including some file extension logic under win32.
|
Sat, 28 Apr 2007 16:28:54 +0200 |
Joel Rosdahl |
Fix bad reference to RepoError in import command
|
Fri, 27 Apr 2007 21:30:55 -0700 |
Bryan O'Sullivan |
Refactor commands.serve to allow other commands to run as services.
|
Thu, 26 Apr 2007 18:41:18 -0500 |
Matt Mackall |
Merge with stable
|
Wed, 25 Apr 2007 13:14:01 -0700 |
Brendan Cully |
Do not automatically rename an atomicfile if a write to it has generated an exception.
|
Wed, 25 Apr 2007 18:43:55 +0200 |
Thomas Arendsen Hein |
merge with stable
|
Tue, 24 Apr 2007 18:43:18 -0700 |
Brendan Cully |
Make copy --after work for files that have been hg added.
|
Tue, 24 Apr 2007 12:02:51 -0700 |
Bryan O'Sullivan |
When reloading the dirstate, recompute ignore information if needed.
|
Tue, 24 Apr 2007 12:02:42 -0700 |
Bryan O'Sullivan |
dirstate: speed up write by 50%.
|
Tue, 24 Apr 2007 11:46:15 -0700 |
Bryan O'Sullivan |
dirstate: make parents() faster.
|
Tue, 24 Apr 2007 11:05:39 -0700 |
Bryan O'Sullivan |
localrepository.status: only acquire wlock if actually needed.
|
Tue, 24 Apr 2007 10:53:25 -0700 |
Bryan O'Sullivan |
util._matcher: speed up regexp matching.
|
Tue, 24 Apr 2007 10:47:41 -0700 |
Brendan Cully |
Merge with crew-stable
|
Thu, 19 Apr 2007 17:54:43 +0200 |
Thomas Arendsen Hein |
Merge with crew-stable
|
Thu, 19 Apr 2007 13:04:26 +0200 |
Thomas Arendsen Hein |
Work around problem where 'del os.environ["FOO"]' doesn't update environment.
|
Thu, 19 Apr 2007 12:47:55 +0200 |
Thomas Arendsen Hein |
Use python instead of shell printf with \x for test-simplemerge-cmd
|
Mon, 16 Apr 2007 20:23:45 -0300 |
Alexis S. L. Carvalho |
Merge with crew.
|
Mon, 16 Apr 2007 20:17:39 -0300 |
Alexis S. L. Carvalho |
change tests to use simplemerge by default
|
Mon, 16 Apr 2007 20:17:39 -0300 |
Alexis S. L. Carvalho |
polish the simplemerge command; add a test
|
Mon, 16 Apr 2007 20:17:39 -0300 |
Alexis S. L. Carvalho |
actually port simplemerge to hg
|
Mon, 16 Apr 2007 20:17:39 -0300 |
Alexis S. L. Carvalho |
Import 3-way merge code from bzr
|
Mon, 16 Apr 2007 20:17:39 -0300 |
Alexis S. L. Carvalho |
add mdiff.get_matching_blocks
|
Mon, 16 Apr 2007 13:31:15 -0300 |
Alexis S. L. Carvalho |
Merge with crew-stable.
|
Wed, 25 Apr 2007 13:35:18 -0500 |
Matt Mackall |
hg serve: don't do DNS lookups
|
Sat, 27 Jan 2007 23:07:06 +0100 |
Thomas Arendsen Hein |
Fix segfaults when parsing bdiff hunks in mpatch.decode() and .patchedsize()
|
Tue, 24 Apr 2007 10:44:13 -0700 |
Brendan Cully |
Work around python 2.5.1 tarfile regression
|
Thu, 19 Apr 2007 17:52:42 +0200 |
Thomas Arendsen Hein |
Avoid float rounding errors when checking http protocol version.
|
Mon, 16 Apr 2007 12:37:30 -0500 |
Matt Mackall |
Merge with stable
|
Mon, 16 Apr 2007 12:27:49 -0500 |
Matt Mackall |
Merge with crew
|
Tue, 10 Apr 2007 16:25:21 -0500 |
TK Soh |
test-command-template: improve test coverage
|
Mon, 16 Apr 2007 13:00:23 -0300 |
Alexis S. L. Carvalho |
command line templates: add formatnode filter
|
Mon, 16 Apr 2007 13:00:23 -0300 |
Alexis S. L. Carvalho |
fix 'hg <not-log> -v --template foo' with revisions without copies
|
Mon, 16 Apr 2007 12:24:52 -0500 |
Matt Mackall |
merge: fix quadratic behavior in find-copies
|
Mon, 16 Apr 2007 09:52:37 -0500 |
Matt Mackall |
Merge with stable
|
Mon, 16 Apr 2007 09:51:50 -0500 |
Matt Mackall |
hgweb: fix rfind bug in PATH_INFO handling
|
Sun, 15 Apr 2007 18:42:51 -0500 |
Matt Mackall |
Merge with crew
|
Sun, 15 Apr 2007 18:42:38 -0500 |
Matt Mackall |
Merge with stable
|
Thu, 12 Apr 2007 16:05:28 -0700 |
Brendan Cully |
Merge with Matt
|
Mon, 09 Apr 2007 10:39:28 +0200 |
Joel Rosdahl |
Add graphlog extension
|
Thu, 12 Apr 2007 15:07:05 -0700 |
Brendan Cully |
Merge with crew-stable
|
Sun, 15 Apr 2007 18:40:22 -0500 |
Matt Mackall |
Merge with crew
|
Thu, 12 Apr 2007 14:45:53 -0700 |
Brendan Cully |
mq: fix qtop when some patches beneath are guarded
|
Thu, 12 Apr 2007 22:41:50 +0200 |
Patrick Mezard |
mq: test qtop with holes in the patch sequence.
|
Thu, 12 Apr 2007 11:00:21 -0500 |
Matt Mackall |
hgweb: make PATH_INFO handling slightly more robust
|
Thu, 12 Apr 2007 12:42:22 -0500 |
Matt Mackall |
Merge with crew
|
Tue, 10 Apr 2007 10:34:43 -0700 |
Brendan Cully |
Merge with crew-stable
|
Mon, 09 Apr 2007 04:57:25 -0300 |
Alexis S. L. Carvalho |
Merge with crew-stable.
|
Tue, 10 Apr 2007 14:05:15 -0500 |
Matt Mackall |
Merge with stable
|
Tue, 10 Apr 2007 12:24:28 -0500 |
TK Soh |
minor typo fix in templater's docstring
|
Sat, 07 Apr 2007 19:42:26 +0100 |
Patrick Mezard |
Add test for issue 529 - "mq aborts when merging patch deleting files".
|
Mon, 09 Apr 2007 04:24:17 -0300 |
Alexis S. L. Carvalho |
mq: don't abort when merging a patch that removes files
|
Mon, 09 Apr 2007 04:24:17 -0300 |
Alexis S. L. Carvalho |
atomicfile: don't copy the original file if it'll be truncated
|