Mercurial > hg

comparison tests/test-convert-cvs-detectmerge.t @ 12585:385fd0eee005

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-convert-cvs-detectmerge: add sleep so cvs notices changes
author Mads Kiilerich <mads@kiilerich.com>
date Wed, 29 Sep 2010 01:33:31 +0200
parents 539480ce1c89
children 6cc4b14fb76b
comparison
equal deleted inserted replaced
12584:fb24b491e06a 12585:385fd0eee005
51 T file1 51 T file1
52 52
53 modify file1 on branch v1_0 53 modify file1 on branch v1_0
54 54
55 $ cvscall -Q update -rv1_0 55 $ cvscall -Q update -rv1_0
56 $ sleep 1
56 $ echo "change" >> file1 57 $ echo "change" >> file1
57 $ cvsci -m"add text" 58 $ cvsci -m"add text"
58 cvs commit: Examining . 59 cvs commit: Examining .
59 60
60 make unrelated change on v1_1 61 make unrelated change on v1_1
93 $ cvsci -m"add file2 on trunk" file2 94 $ cvsci -m"add file2 on trunk" file2
94 95
95 this will create rev 1.3 96 this will create rev 1.3
96 change on trunk to backport 97 change on trunk to backport
97 98
99 $ sleep 1
98 $ echo "backport me" >> file1 100 $ echo "backport me" >> file1
99 $ cvsci -m"add other text" file1 101 $ cvsci -m"add other text" file1
100 $ cvscall log file1 102 $ cvscall log file1
101 103
102 RCS file: */cvsrepo/proj/file1,v (glob) 104 RCS file: */cvsrepo/proj/file1,v (glob)
146 $ cvsci -m"add other text [MERGE from HEAD]" file1 148 $ cvsci -m"add other text [MERGE from HEAD]" file1
147 149
148 fix bug on v1_1, merge to trunk with error 150 fix bug on v1_1, merge to trunk with error
149 151
150 $ cvscall -Q update -rv1_1 152 $ cvscall -Q update -rv1_1
153 $ sleep 1
151 $ echo "merge forward" >> file1 154 $ echo "merge forward" >> file1
152 $ cvscall -Q tag unmerged 155 $ cvscall -Q tag unmerged
153 $ cvsci -m"fix file1" 156 $ cvsci -m"fix file1"
154 cvs commit: Examining . 157 cvs commit: Examining .
155 $ cvscall -Q update -A 158 $ cvscall -Q update -A