Mon, 05 Apr 2010 19:49:19 +0200 merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 05 Apr 2010 19:49:19 +0200] rev 10837
merge with stable
Mon, 05 Apr 2010 18:13:20 +0200 dirstate: fix in memory dirstate entries for 1-second race stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 05 Apr 2010 18:13:20 +0200] rev 10836
dirstate: fix in memory dirstate entries for 1-second race Only the on-disk file was modified, we need to modify the in-memory dirstate as well.
(0) -10000 -3000 -1000 -300 -100 -30 -10 -2 +2 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip