changeset 14569:017ab404e588

tests: fix up date ambiguity in cvs test
author Matt Mackall <mpm@selenic.com>
date Sat, 11 Jun 2011 14:14:53 -0500
parents 5f002e3336ba
children 9f908ef5a595
files tests/test-convert-cvs-detectmerge.t
diffstat 1 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-convert-cvs-detectmerge.t	Sat Jun 11 14:14:52 2011 -0500
+++ b/tests/test-convert-cvs-detectmerge.t	Sat Jun 11 14:14:53 2011 -0500
@@ -16,6 +16,7 @@
 
   $ cvsci()
   > {
+  >     sleep 1
   >     cvs -f ci "$@" > /dev/null
   > }
 
@@ -53,7 +54,6 @@
 modify file1 on branch v1_0
 
   $ cvscall -Q update -rv1_0
-  $ sleep 1
   $ echo "change" >> file1
   $ cvsci -m"add text"
   cvs commit: Examining .
@@ -96,7 +96,6 @@
 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
@@ -150,7 +149,6 @@
 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"