diff tests/test-issue660 @ 5516:f252ba975925

Fix dir-changed-to-file updates on clean workdir. Workaround for dir-changed-to-file updates mentioned in rev 7a64931e2d76 doesn't actually work since tests introduced in mentioned changeset prevented dirstate updates even if working directory updates succeded. Make tests more relaxed for dirstate operations not directly accessible from cli. See also issue660. While here, move _dirs existance check from _decpath() to _changepath() for unification.
author Maxim Dounin <mdounin@mdounin.ru>
date Wed, 07 Nov 2007 22:57:28 +0100
parents 7a64931e2d76
children 942287cb1f57
line wrap: on
line diff
--- a/tests/test-issue660	Fri Oct 26 16:43:13 2007 -0700
+++ b/tests/test-issue660	Wed Nov 07 22:57:28 2007 +0100
@@ -80,10 +80,15 @@
 
 echo % should succeed - shadow removed
 hg add d
+hg ci -md
 
-#echo % update should work
-#
-#hg up -r 0
-#hg up -r 1
+echo % update should work at least with clean workdir
+
+rm -r a b d
+hg up -r 0
+hg st --all
+rm -r a b
+hg up -r 1
+hg st --all
 
 exit 0