[PATCH 2 of 3] Have svn subrepos be checked out in the repo and not in the cwd
Brett Cannon
brett at python.org
Sat Apr 17 15:31:07 CDT 2010
# HG changeset patch
# User Brett Cannon <brett at python.org>
# Date 1271534863 25200
# Branch stable
# Node ID 1c5e380ab8f5dc5bbac65e57f887aab89d05605c
# Parent fbc8aeadff7e88d9343f02c6cea756d70785f2a5
Have svn subrepos be checked out in the repo and not in the cwd.
Fixes issue #2134. Unfortunately the svn subrepo test currently fails
thanks to a path now being outputted by svn as absolute instead of
relative.
diff -r fbc8aeadff7e -r 1c5e380ab8f5 mercurial/subrepo.py
--- a/mercurial/subrepo.py Sat Apr 17 13:04:27 2010 -0700
+++ b/mercurial/subrepo.py Sat Apr 17 13:07:43 2010 -0700
@@ -273,7 +273,8 @@
self._ui = ctx._repo.ui
def _svncommand(self, commands):
- cmd = ['svn'] + commands + [self._path]
+ path = os.path.join(self._ctx._repo.origroot, self._path)
+ cmd = ['svn'] + commands + [path]
cmd = [util.shellquote(arg) for arg in cmd]
cmd = util.quotecommand(' '.join(cmd))
env = dict(os.environ)
More information about the Mercurial-devel
mailing list