##// END OF EJS Templates
convert/bzr: make tests work with bzr 2.0 again...
Thomas Arendsen Hein -
r17034:75fd9d1c stable
parent child Browse files
Show More
@@ -215,25 +215,23 b' Multiple branches'
215 $ bzr co repo/trunk repo-trunk
215 $ bzr co repo/trunk repo-trunk
216 $ cd repo-trunk
216 $ cd repo-trunk
217 $ echo a > a
217 $ echo a > a
218 $ bzr add a
218 $ bzr add -q a
219 adding a
219 $ bzr ci -qm adda
220 $ bzr ci -qm adda --commit-time '2012-01-01 00:00:01 +0000'
221 $ bzr tag trunk-tag
220 $ bzr tag trunk-tag
222 Created tag trunk-tag.
221 Created tag trunk-tag.
223 $ bzr switch -b branch
222 $ bzr switch -b branch
224 Tree is up to date at revision 1.
223 Tree is up to date at revision 1.
225 Switched to branch: *repo/branch/ (glob)
224 Switched to branch: *repo/branch/ (glob)
226 $ echo b > b
225 $ echo b > b
227 $ bzr add b
226 $ bzr add -q b
228 adding b
227 $ bzr ci -qm addb
229 $ bzr ci -qm addb --commit-time '2012-01-01 00:00:02 +0000'
230 $ bzr tag branch-tag
228 $ bzr tag branch-tag
231 Created tag branch-tag.
229 Created tag branch-tag.
232 $ bzr switch --force ../repo/trunk
230 $ bzr switch --force ../repo/trunk
233 Updated to revision 1.
231 Updated to revision 1.
234 Switched to branch: */repo/trunk/ (glob)
232 Switched to branch: */repo/trunk/ (glob)
235 $ echo a >> a
233 $ echo a >> a
236 $ bzr ci -qm changea --commit-time '2012-01-01 00:00:03 +0000'
234 $ bzr ci -qm changea
237 $ cd ..
235 $ cd ..
238 $ hg convert --datesort repo repo-bzr
236 $ hg convert --datesort repo repo-bzr
239 initializing destination repo-bzr repository
237 initializing destination repo-bzr repository
@@ -269,8 +267,7 b' Nested repositories (issue3254)'
269 $ bzr co repo/inner/trunk inner-trunk
267 $ bzr co repo/inner/trunk inner-trunk
270 $ cd inner-trunk
268 $ cd inner-trunk
271 $ echo b > b
269 $ echo b > b
272 $ bzr add b
270 $ bzr add -q b
273 adding b
274 $ bzr ci -qm addb
271 $ bzr ci -qm addb
275 $ cd ..
272 $ cd ..
276 $ hg convert --datesort repo noinner-bzr
273 $ hg convert --datesort repo noinner-bzr
General Comments 0
You need to be logged in to leave comments. Login now