# 
# 
# patch "ChangeLog"
#  from [12cf8107625bf6bd8fb1a2fa079c2808f15405b4]
#    to [9f6eedfc918dc1c50912ecdc99c9084ba4e3f196]
# 
# patch "tests/importing_cvs_branches_with_correct_ancestory/__driver__.lua"
#  from [61ab3524128f3340b1bd03a33d69dc2994ffb533]
#    to [e099fd52c8883ea4e243fa2483008fcf3103d64b]
# 
============================================================
--- ChangeLog	12cf8107625bf6bd8fb1a2fa079c2808f15405b4
+++ ChangeLog	9f6eedfc918dc1c50912ecdc99c9084ba4e3f196
@@ -1,5 +1,10 @@
 2006-07-06  Timothy Brownawell  <address@hidden>
 
+	* tests/importing_cvs_branches_with_correct_ancestory/__driver__.lua:
+	Move a sleep(). Maybe it'll work reliably now?
+
+2006-07-06  Timothy Brownawell  <address@hidden>
+
 	* tests/fail_cleanly_on_unreadable__MTN_options/__driver__.lua:
 	Monotone now checks that it was given a command before it looks at
 	_MTN. So, check that "mtn status" fails properly, instead of just "mtn".
============================================================
--- tests/importing_cvs_branches_with_correct_ancestory/__driver__.lua	61ab3524128f3340b1bd03a33d69dc2994ffb533
+++ tests/importing_cvs_branches_with_correct_ancestory/__driver__.lua	e099fd52c8883ea4e243fa2483008fcf3103d64b
@@ -58,8 +58,8 @@
 check(cvs("commit", "-m", 'commit on branch', "testdir/file2", "testdir/changelog"), 0, false, false)
 
 -- and create some mainline changes after the branch
+check(cvs("up", "-A"), 0, false, false)
 sleep(1)
-check(cvs("up", "-A"), 0, false, false)
 writefile("testdir/file1", readfile("file1.2"))
 writefile("testdir/changelog", readfile("changelog.2"))
 check(cvs("commit", "-m", 'commit on mainline after branch', "testdir/file1", "testdir/changelog"), 0, false, false)