[PATCH 2 of 3] Have svn subrepos be checked out in the repo and not in the cwd

[Matt Mackall]

On Sun, 2010-04-18 at 12:56 -0700, Brett Cannon wrote:
> 
> 
> On Sun, Apr 18, 2010 at 12:22, Greg Ward <greg-hg at gerg.ca> wrote:
>         On Sat, Apr 17, 2010 at 4:31 PM, Brett Cannon
>         <brett at python.org> wrote:
>         > # 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.
>         
>         
>         Is that what your patch #3 fixes?  If so, you should probably
>         fold it
>         into this one -- we try to keep it so each changeset passes
>         the whole
>         test suite.
> 
> 
> Yes, patch #3 gets everything passing short of the
> subprocess.Popen.__del__ failure (which I have a patch into Python to
> fix, just waiting for a Windows user to verify I didn't break anything
> before I commit it: bugs.python.org/issue5099).
> 
> 
> As for folding the commits into one, is there any command that can do
> this for me, or do I need to do a fresh checkout and commit to that to
> do a new, unified changeset?

qimport + qfold will do the trick.


-- 
http://selenic.com : development and support for Mercurial and Linux