# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1340713940 -7200
# Node ID ab4644c3064fd12738b18d6f65c6acd5799d57b3
# Parent  0413f68da85c943a1754c5d0e67bc743edc57381# Parent  ba0286e149aae35f49ca73a420bdefdd24d38ee4
merge with crew-stable

diff -r 0413f68da85c -r ab4644c3064f mercurial/subrepo.py
--- a/mercurial/subrepo.py	Tue Jun 26 03:35:22 2012 +0200
+++ b/mercurial/subrepo.py	Tue Jun 26 14:32:20 2012 +0200
@@ -732,7 +732,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
diff -r 0413f68da85c -r ab4644c3064f tests/test-convert-bzr.t
--- a/tests/test-convert-bzr.t	Tue Jun 26 03:35:22 2012 +0200
+++ b/tests/test-convert-bzr.t	Tue Jun 26 14:32:20 2012 +0200
@@ -218,25 +218,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
@@ -272,8 +270,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