[PATCH] imported patch subrepo-in-out-rel-path

[Martin Geisler]

Martin Geisler <mg at aragost.com> writes:

> # HG changeset patch
> # User Martin Geisler <mg at aragost.com>
> # Date 1305724406 -7200
> # Node ID d7788c32cbfeff9aa70ceb44213c77c669ade388
> # Parent  cb4ff8ef466b2bb5fa820e32501fcc0fc9195087
> imported patch subrepo-in-out-rel-path

Oh well, it's too long since I used 'hg email' -- I wanted to add an
introductiory message :-)

The patch below tries to fix an issue with incoming and outgoing and
subrepos. The update to test-subrepo.t shows the new and correct
behavior:

  $ hg -R issue1852d outgoing --subrepos issue1852c
  comparing with issue1852c
  searching for changes
  no changes found
  comparing with issue1852c/sub/repo
  ...

whereas the old behavior was:

  $ hg -R issue1852d outgoing --subrepos issue1852c
  comparing with issue1852c
  searching for changes
  no changes found
  comparing with $TESTTMP/sub/issue1852a/sub/repo
  ...

But the change breaks test-subrepo-recursion.t:

  --- /home/mg/src/mercurial-crew/tests/test-subrepo-recursion.t
  +++ /home/mg/src/mercurial-crew/tests/test-subrepo-recursion.t.err
  @@ -321,13 +321,8 @@
     comparing with $TESTTMP/repo
     searching for changes
     no changes found
  -  comparing with $TESTTMP/repo/foo
  -  searching for changes
  -  no changes found
  -  comparing with $TESTTMP/repo/foo/bar
  -  searching for changes
  -  no changes found
  -  [1]
  +  abort: default path for subrepository foo not found
  +  [255]

Can anybody spot the (probably small) mistake?

-- 
Martin Geisler

aragost Trifork
Professional Mercurial support
http://mercurial.aragost.com/kick-start/