facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 00:14:35 +03:00
Code Issues Projects Releases Wiki Activity
1,074 Commits 24 Branches 62 Tags 322 MiB
bba79f0fb3
Commit Graph

6 Commits

Author SHA1 Message Date
mpm@selenic.com
ea7bd9ea6f run-tests: remove '+ hg' trick 
This was causing me a fair amount of debugging confusion. Let's just
forget it entirely. Updated tests to match.
 2005-08-16 19:03:01 -08:00
Thomas Arendsen Hein
4c34f07491 Extended test case to test dirstate length bug fixed in 2abe02c00cbd. 2005-08-10 08:23:42 +01:00
Thomas Arendsen Hein
20e6210ce8 Fix 3-way-merge of original parent, workdir and new parent. 
The dirstate has to match what is in the repository (what would be
checked out with 'hg update -C'), because the resulting file may be
identical to the new parent, or it may be completely different.
Previously the dirstate wasn't updated, so if you changed the file to
look like the original parent, it might be considered unmodified
relative to the new parent.
 2005-08-10 06:47:46 +01:00
Thomas Arendsen Hein
264aecc43e Removed special FIXME handling in run-tests, added bug info to .out files. 2005-08-04 18:13:17 +01:00
Thomas Arendsen Hein
87aabef405 Updated output of tests. 2005-07-29 15:21:02 +01:00
Thomas Arendsen Hein
daaaa3ac34 Added tests for bug with three-way-merging of old tip, tip and cwd. 2005-07-23 17:14:05 +01:00