Bryan O'Sullivan <bos@serpentine.com> [Thu, 01 Nov 2007 15:22:10 -0700] rev 5500
Merge with crew-stable.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 30 Oct 2007 16:56:01 -0700] rev 5499
Merge with crew-stable.
Patrick Mezard <pmezard@gmail.com> [Thu, 01 Nov 2007 12:37:17 +0100] rev 5498
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Tue, 30 Oct 2007 22:14:15 +0100] rev 5497
convert: fail if an external required tool is not found
Patrick Mezard <pmezard@gmail.com> [Sun, 28 Oct 2007 09:47:54 +0100] rev 5496
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sat, 27 Oct 2007 20:23:46 +0200] rev 5495
test-execute-bit: skip if execute-bit is not supported
Bryan O'Sullivan <bos@serpentine.com> [Fri, 26 Oct 2007 16:43:13 -0700] rev 5494
See if execute bit is honoured when we go back in time
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 26 Oct 2007 12:37:59 +0200] rev 5493
merge with -stable
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 25 Oct 2007 21:37:20 +0200] rev 5492
merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Thu, 25 Oct 2007 00:09:13 +0200] rev 5491
Merge with crew-stable
Bryan O'Sullivan <bos@serpentine.com> [Fri, 26 Oct 2007 16:43:13 -0700] rev 5490
See if execute bit is honoured when we go back in time
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 05 Nov 2007 18:49:35 -0200] rev 5489
Honour the exec bit when we go back in time.
Fixes issue801.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 05 Nov 2007 20:15:33 +0100] rev 5488
fix typo in convert help text, update test
Maxim Dounin <mdounin@mdounin.ru> [Mon, 05 Nov 2007 20:05:44 +0300] rev 5487
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
Rocco Rutte <pdmef@gmx.net> [Sat, 03 Nov 2007 17:04:42 +0100] rev 5486
hgweb_mod: update unidiff() calls and finish e5eedd74e70f job
Bryan O'Sullivan <bos@serpentine.com> [Fri, 02 Nov 2007 14:44:33 -0700] rev 5485
Fix context iterator.
"Rafael Villar Burke <pachi@rvburke.com>" [Fri, 02 Nov 2007 20:09:21 +0100] rev 5484
Update convert help text
Add Mercurial as a source format, clarify that the include directive triggers the exclusion of all not explicitely included files/dirs and use MAPFILE instead of revmapfile in the text, following the short message convention.
Hollis Blanchard <hollisb@us.ibm.com> [Thu, 01 Nov 2007 17:15:50 -0500] rev 5483
Handle patches with misformatted empty lines
Insert a space on empty lines which are missing a control character.
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
---
I frequently receive emailed patches with empty lines represented as "\n\n",
where Mercurial expects them to be "\n \n". patch(1) applies these patches
without complaint, but qpush fails all hunks.
Dustin Sallings <dustin@spy.net> [Thu, 01 Nov 2007 12:17:59 -0700] rev 5482
Use both the from and to name in mdiff.unidiff.
This fixes a compatibility issue with git diffs.
* * *
Patrick Mezard <pmezard@gmail.com> [Thu, 01 Nov 2007 12:05:14 +0100] rev 5481
Fix Windows os.popen bug with interleaved stdout/stderr output
See python bug 1366 "popen spawned process may not write to stdout under windows" for more details.
Elliott Peele <elliot@rpath.com> [Tue, 30 Oct 2007 16:54:25 -0700] rev 5480
https url handling: usernames and passwords were registered to the wrong url
Christian Ebert <blacktrash@gmx.net> [Sun, 28 Oct 2007 09:25:35 +0100] rev 5479
patchbomb: no traceback if (diffstat) confirmation is refused
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 26 Oct 2007 12:01:14 +0200] rev 5478
patchbomb: fix traceback when diffstat isn't available
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 25 Oct 2007 19:40:56 +0200] rev 5477
Only set mode of new patch if the target file was removed before.
If the file is writable by the user, but owned by a different user, the
chmod will otherwise fail with "Operation not permitted".
Additionally make very sure that the file is only written if either the number
of links is <= 1 or the file was successfully removed.
Maybe this minimal COW code should be replaced by something from util.
Sebastian Hauer <sebastian.hauer@gmail.com> [Wed, 24 Oct 2007 22:15:45 +0200] rev 5476
httprepo: ignore environment proxies when proxies are disabled
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 20 Oct 2007 03:04:34 +0200] rev 5475
gpg: use the same log message format as hg tag
Matt Mackall <mpm@selenic.com> [Fri, 19 Oct 2007 18:25:28 -0500] rev 5474
Added signature for changeset 23889160905a1b09fffe1c07378e9fc1827606eb
Matt Mackall <mpm@selenic.com> [Fri, 19 Oct 2007 18:25:24 -0500] rev 5473
Added tag 0.9.5 for changeset 23889160905a
Christian Ebert <blacktrash@gmx.net> [Fri, 07 Sep 2007 16:48:42 +0200] rev 5472
Catch smtp exceptions
Jim Hague <jim.hague@acm.org> [Fri, 19 Oct 2007 19:20:33 +0000] rev 5471
tests: make test-mq-guards work with ksh