Maxim Dounin <mdounin@mdounin.ru> [Sat, 27 Oct 2007 16:27:55 +0400] rev 5483
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.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 26 Oct 2007 16:43:13 -0700] rev 5482
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 5481
merge with -stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 26 Oct 2007 12:01:14 +0200] rev 5480
patchbomb: fix traceback when diffstat isn't available
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 25 Oct 2007 21:37:20 +0200] rev 5479
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 25 Oct 2007 19:40:56 +0200] rev 5478
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.
Patrick Mezard <pmezard@gmail.com> [Thu, 25 Oct 2007 00:09:13 +0200] rev 5477
Merge with crew-stable
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