comparison tests/test-convert-bzr.t @ 44324:84d98fa814a8 stable

tests: accept new bzr message about switching branches The new version apparently prints "Switched to branch at " instead of "Switched to branch: ". Differential Revision: https://phab.mercurial-scm.org/D8106
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 10 Feb 2020 15:52:52 -0800
parents 0c72eddb4be5
children 26127236b229
comparison
equal deleted inserted replaced
44302:815e9ca1078c 44324:84d98fa814a8
224 $ bzr ci -qm adda 224 $ bzr ci -qm adda
225 $ bzr tag trunk-tag 225 $ bzr tag trunk-tag
226 Created tag trunk-tag. 226 Created tag trunk-tag.
227 $ bzr switch -b branch 227 $ bzr switch -b branch
228 Tree is up to date at revision 1. 228 Tree is up to date at revision 1.
229 Switched to branch: *repo/branch/ (glob) 229 Switched to branch*repo/branch/ (glob)
230 $ sleep 1 230 $ sleep 1
231 $ echo b > b 231 $ echo b > b
232 $ bzr add -q b 232 $ bzr add -q b
233 $ bzr ci -qm addb 233 $ bzr ci -qm addb
234 $ bzr tag branch-tag 234 $ bzr tag branch-tag
235 Created tag branch-tag. 235 Created tag branch-tag.
236 $ bzr switch --force ../repo/trunk 236 $ bzr switch --force ../repo/trunk
237 Updated to revision 1. 237 Updated to revision 1.
238 Switched to branch: */repo/trunk/ (glob) 238 Switched to branch*/repo/trunk/ (glob)
239 $ sleep 1 239 $ sleep 1
240 $ echo a >> a 240 $ echo a >> a
241 $ bzr ci -qm changea 241 $ bzr ci -qm changea
242 $ cd .. 242 $ cd ..
243 $ hg convert --datesort repo repo-bzr 243 $ hg convert --datesort repo repo-bzr