Show More
@@ -732,7 +732,7 b' class svnsubrepo(abstractsubrepo):' | |||||
732 | # URL exists at lastrev. Test it and fallback to rev it |
|
732 | # URL exists at lastrev. Test it and fallback to rev it | |
733 | # is not there. |
|
733 | # is not there. | |
734 | try: |
|
734 | try: | |
735 |
self._svncommand([' |
|
735 | self._svncommand(['list', '%s@%s' % (self._state[0], lastrev)]) | |
736 | return lastrev |
|
736 | return lastrev | |
737 | except error.Abort: |
|
737 | except error.Abort: | |
738 | pass |
|
738 | pass |
@@ -218,25 +218,23 b' Multiple branches' | |||||
218 | $ bzr co repo/trunk repo-trunk |
|
218 | $ bzr co repo/trunk repo-trunk | |
219 | $ cd repo-trunk |
|
219 | $ cd repo-trunk | |
220 | $ echo a > a |
|
220 | $ echo a > a | |
221 | $ bzr add a |
|
221 | $ bzr add -q a | |
222 | adding a |
|
222 | $ bzr ci -qm adda | |
223 | $ bzr ci -qm adda --commit-time '2012-01-01 00:00:01 +0000' |
|
|||
224 | $ bzr tag trunk-tag |
|
223 | $ bzr tag trunk-tag | |
225 | Created tag trunk-tag. |
|
224 | Created tag trunk-tag. | |
226 | $ bzr switch -b branch |
|
225 | $ bzr switch -b branch | |
227 | Tree is up to date at revision 1. |
|
226 | Tree is up to date at revision 1. | |
228 | Switched to branch: *repo/branch/ (glob) |
|
227 | Switched to branch: *repo/branch/ (glob) | |
229 | $ echo b > b |
|
228 | $ echo b > b | |
230 | $ bzr add b |
|
229 | $ bzr add -q b | |
231 | adding b |
|
230 | $ bzr ci -qm addb | |
232 | $ bzr ci -qm addb --commit-time '2012-01-01 00:00:02 +0000' |
|
|||
233 | $ bzr tag branch-tag |
|
231 | $ bzr tag branch-tag | |
234 | Created tag branch-tag. |
|
232 | Created tag branch-tag. | |
235 | $ bzr switch --force ../repo/trunk |
|
233 | $ bzr switch --force ../repo/trunk | |
236 | Updated to revision 1. |
|
234 | Updated to revision 1. | |
237 | Switched to branch: */repo/trunk/ (glob) |
|
235 | Switched to branch: */repo/trunk/ (glob) | |
238 | $ echo a >> a |
|
236 | $ echo a >> a | |
239 | $ bzr ci -qm changea --commit-time '2012-01-01 00:00:03 +0000' |
|
237 | $ bzr ci -qm changea | |
240 | $ cd .. |
|
238 | $ cd .. | |
241 | $ hg convert --datesort repo repo-bzr |
|
239 | $ hg convert --datesort repo repo-bzr | |
242 | initializing destination repo-bzr repository |
|
240 | initializing destination repo-bzr repository | |
@@ -272,8 +270,7 b' Nested repositories (issue3254)' | |||||
272 | $ bzr co repo/inner/trunk inner-trunk |
|
270 | $ bzr co repo/inner/trunk inner-trunk | |
273 | $ cd inner-trunk |
|
271 | $ cd inner-trunk | |
274 | $ echo b > b |
|
272 | $ echo b > b | |
275 | $ bzr add b |
|
273 | $ bzr add -q b | |
276 | adding b |
|
|||
277 | $ bzr ci -qm addb |
|
274 | $ bzr ci -qm addb | |
278 | $ cd .. |
|
275 | $ cd .. | |
279 | $ hg convert --datesort repo noinner-bzr |
|
276 | $ hg convert --datesort repo noinner-bzr |
General Comments 0
You need to be logged in to leave comments.
Login now