Thu, 25 Oct 2007 21:37:20 +0200 merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 25 Oct 2007 21:37:20 +0200] rev 5492
merge with crew-stable
Thu, 25 Oct 2007 00:09:13 +0200 Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Thu, 25 Oct 2007 00:09:13 +0200] rev 5491
Merge with crew-stable
Fri, 26 Oct 2007 16:43:13 -0700 See if execute bit is honoured when we go back in time
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
Mon, 05 Nov 2007 18:49:35 -0200 Honour the exec bit 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.
Mon, 05 Nov 2007 20:15:33 +0100 fix typo in convert help text, update test
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
Mon, 05 Nov 2007 20:05:44 +0300 Fix file-changed-to-dir and dir-to-file commits (issue660).
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.
(0) -3000 -1000 -300 -100 -30 -10 -6 +6 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip