# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 2010-09-28 23:33:31
# Node ID 385fd0eee00524733b7f500a032214b72af78937
# Parent  fb24b491e06a174efb7cf14eb1510de62184ecfa

test-convert-cvs-detectmerge: add sleep so cvs notices changes

diff --git a/tests/test-convert-cvs-detectmerge.t b/tests/test-convert-cvs-detectmerge.t
--- a/tests/test-convert-cvs-detectmerge.t
+++ b/tests/test-convert-cvs-detectmerge.t
@@ -53,6 +53,7 @@ create two release branches
 modify file1 on branch v1_0
 
   $ cvscall -Q update -rv1_0
+  $ sleep 1
   $ echo "change" >> file1
   $ cvsci -m"add text"
   cvs commit: Examining .
@@ -95,6 +96,7 @@ non-merged change on trunk
 this will create rev 1.3
 change on trunk to backport
 
+  $ sleep 1
   $ echo "backport me" >> file1
   $ cvsci -m"add other text" file1
   $ cvscall log file1
@@ -148,6 +150,7 @@ backport trunk change to v1_1
 fix bug on v1_1, merge to trunk with error
 
   $ cvscall -Q update -rv1_1
+  $ sleep 1
   $ echo "merge forward" >> file1
   $ cvscall -Q tag unmerged
   $ cvsci -m"fix file1"