# 
# 
# patch "ChangeLog"
#  from [22f7eef4db2323cac5b9312203c06ed47189f04b]
#    to [74761682468f10590ec53228d98971347a911a18]
# 
# patch "tests/importing_cvs_branches_with_correct_ancestory/__driver__.lua"
#  from [fa31cd63b45c828bf4a6461a13d661571e6bca2a]
#    to [61ab3524128f3340b1bd03a33d69dc2994ffb533]
# 
============================================================
--- ChangeLog	22f7eef4db2323cac5b9312203c06ed47189f04b
+++ ChangeLog	74761682468f10590ec53228d98971347a911a18
@@ -1,5 +1,11 @@
 2006-07-05  Timothy Brownawell  <address@hidden>
 
+	* tests/importing_cvs_branches_with_correct_ancestory/__driver__.lua:
+	Add some sleep() s to (try to) fix intermittent failures, apparently
+	caused by CVS using only timestamps for change detection.
+
+2006-07-05  Timothy Brownawell  <address@hidden>
+
 	* diff-patch.cc: Apply njs's patch to fix crash.
 	* tests/merge_conflict_with_no_lca/__driver__.lua: Remove xfail.
 
============================================================
--- tests/importing_cvs_branches_with_correct_ancestory/__driver__.lua	fa31cd63b45c828bf4a6461a13d661571e6bca2a
+++ tests/importing_cvs_branches_with_correct_ancestory/__driver__.lua	61ab3524128f3340b1bd03a33d69dc2994ffb533
@@ -42,6 +42,7 @@
 check(cvs("commit", "-m", 'initial import', "testdir/file1", "testdir/file2", "testdir/changelog"), 0, false, false)
 
 -- commit first changes
+sleep(1)
 writefile("testdir/file1", readfile("file1.1"))
 writefile("testdir/changelog", readfile("changelog.1"))
 check(cvs("commit", "-m", 'first commit', "testdir/file1", "testdir/changelog"), 0, false, false)
@@ -51,11 +52,13 @@
 check(indir("testdir", cvs("up", "-r", "branched")), 0, false, false)
 
 -- alter the files on the branch
+sleep(1)
 writefile("testdir/file2", readfile("file2.1"))
 writefile("testdir/changelog", readfile("changelog.3"))
 check(cvs("commit", "-m", 'commit on branch', "testdir/file2", "testdir/changelog"), 0, false, false)
 
 -- and create some mainline changes after the branch
+sleep(1)
 check(cvs("up", "-A"), 0, false, false)
 writefile("testdir/file1", readfile("file1.2"))
 writefile("testdir/changelog", readfile("changelog.2"))