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.