##// END OF EJS Templates
transaction: tests we don't overwrite branch changes on abort...
marmoute -
r51066:d956ceed stable
parent child Browse files
Show More
@@ -155,3 +155,36 b' Changing tracked file'
155 $ hg status
155 $ hg status
156 R default_a (missing-correct-output !)
156 R default_a (missing-correct-output !)
157 $ hg revert --all --quiet
157 $ hg revert --all --quiet
158
159 Changing branch from default
160 ----------------------------
161
162 $ hg branch
163 default
164 $ hg phase --public --rev 0 2> ../log.err &
165 $ $RUNTESTDIR/testlib/wait-on-file 5 $TESTTMP/transaction-waiting
166 $ hg branch celeste
167 marked working directory as branch celeste
168 $ hg branch
169 celeste
170 $ touch $TESTTMP/transaction-continue
171 $ wait
172 $ hg branch
173 celeste
174
175 Changing branch from another one
176 --------------------------------
177
178 $ hg up babar --quiet
179 $ hg branch
180 babar
181 $ hg phase --public --rev 0 2> ../log.err &
182 $ $RUNTESTDIR/testlib/wait-on-file 5 $TESTTMP/transaction-waiting
183 $ hg branch celeste
184 marked working directory as branch celeste
185 $ hg branch
186 celeste
187 $ touch $TESTTMP/transaction-continue
188 $ wait
189 $ hg branch
190 celeste
General Comments 0
You need to be logged in to leave comments. Login now