Sat, 14 Oct 2006 10:53:29 +0200 Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 14 Oct 2006 10:53:29 +0200] rev 3389
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates) (Test case created by Johannes Hofmann)
Sat, 14 Oct 2006 10:39:40 +0200 merge with upstream
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 14 Oct 2006 10:39:40 +0200] rev 3388
merge with upstream
Fri, 13 Oct 2006 17:58:04 -0500 merge: update dirstate correctly for non-branchmerge updates
Matt Mackall <mpm@selenic.com> [Fri, 13 Oct 2006 17:58:04 -0500] rev 3387
merge: update dirstate correctly for non-branchmerge updates - we don't actually need the context in recordupdates - use -1 for filesize to force check on normal update - only record copy for branchmerges - forget moved files on update
(0) -3000 -1000 -300 -100 -30 -10 -3 +3 +10 +30 +100 +300 +1000 tip