| 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.
|
