--- a/mercurial/subrepo.py Fri Jun 22 10:19:56 2012 -0300
+++ b/mercurial/subrepo.py Tue Jun 26 14:50:16 2012 -0500
@@ -730,7 +730,7 @@
# URL exists at lastrev. Test it and fallback to rev it
# is not there.
try:
- self._svncommand(['info', '%s@%s' % (self._state[0], lastrev)])
+ self._svncommand(['list', '%s@%s' % (self._state[0], lastrev)])
return lastrev
except error.Abort:
pass
--- a/tests/test-convert-bzr.t Fri Jun 22 10:19:56 2012 -0300
+++ b/tests/test-convert-bzr.t Tue Jun 26 14:50:16 2012 -0500
@@ -215,25 +215,23 @@
$ bzr co repo/trunk repo-trunk
$ cd repo-trunk
$ echo a > a
- $ bzr add a
- adding a
- $ bzr ci -qm adda --commit-time '2012-01-01 00:00:01 +0000'
+ $ bzr add -q a
+ $ bzr ci -qm adda
$ bzr tag trunk-tag
Created tag trunk-tag.
$ bzr switch -b branch
Tree is up to date at revision 1.
Switched to branch: *repo/branch/ (glob)
$ echo b > b
- $ bzr add b
- adding b
- $ bzr ci -qm addb --commit-time '2012-01-01 00:00:02 +0000'
+ $ bzr add -q b
+ $ bzr ci -qm addb
$ bzr tag branch-tag
Created tag branch-tag.
$ bzr switch --force ../repo/trunk
Updated to revision 1.
Switched to branch: */repo/trunk/ (glob)
$ echo a >> a
- $ bzr ci -qm changea --commit-time '2012-01-01 00:00:03 +0000'
+ $ bzr ci -qm changea
$ cd ..
$ hg convert --datesort repo repo-bzr
initializing destination repo-bzr repository
@@ -269,8 +267,7 @@
$ bzr co repo/inner/trunk inner-trunk
$ cd inner-trunk
$ echo b > b
- $ bzr add b
- adding b
+ $ bzr add -q b
$ bzr ci -qm addb
$ cd ..
$ hg convert --datesort repo noinner-bzr