##// END OF EJS Templates
test-convert-cvs-detectmerge: add sleep so cvs notices changes
Mads Kiilerich -
r12585:385fd0ee default
parent child Browse files
Show More
@@ -53,6 +53,7 b' create two release branches'
53 53 modify file1 on branch v1_0
54 54
55 55 $ cvscall -Q update -rv1_0
56 $ sleep 1
56 57 $ echo "change" >> file1
57 58 $ cvsci -m"add text"
58 59 cvs commit: Examining .
@@ -95,6 +96,7 b' non-merged change on trunk'
95 96 this will create rev 1.3
96 97 change on trunk to backport
97 98
99 $ sleep 1
98 100 $ echo "backport me" >> file1
99 101 $ cvsci -m"add other text" file1
100 102 $ cvscall log file1
@@ -148,6 +150,7 b' backport trunk change to v1_1'
148 150 fix bug on v1_1, merge to trunk with error
149 151
150 152 $ cvscall -Q update -rv1_1
153 $ sleep 1
151 154 $ echo "merge forward" >> file1
152 155 $ cvscall -Q tag unmerged
153 156 $ cvsci -m"fix file1"
General Comments 0
You need to be logged in to leave comments. Login now