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