# HG changeset patch # User Mads Kiilerich # Date 1292406619 -3600 # Node ID ce05c8130296b279db87ef8eec415ac5f82a7f5d # Parent 7397a53219c9b782293e3b980e11fd7ae9bccfe1 subrepo: re-backout 2245fcd0e160, remove test 7397a53219c9 re-removed the bad fix but not the test. diff -r 7397a53219c9 -r ce05c8130296 tests/test-subrepo-relative-path.t --- a/tests/test-subrepo-relative-path.t Tue Dec 14 18:10:51 2010 -0600 +++ b/tests/test-subrepo-relative-path.t Wed Dec 15 10:50:19 2010 +0100 @@ -67,58 +67,3 @@ revision 863c1745b441bd97a8c4a096e87793073f4fb215 $ "$TESTDIR/killdaemons.py" - - -Create repo with nested relative subrepos - - $ hg init r1 - $ hg init r1/sub - $ echo sub = sub > r1/.hgsub - $ hg add --cwd r1 .hgsub - $ hg init r1/sub/subsub - $ echo subsub = subsub > r1/sub/.hgsub - $ hg add --cwd r1/sub .hgsub - $ echo c1 > r1/sub/subsub/f - $ hg add --cwd r1/sub/subsub f - $ hg ci --cwd r1 -m0 - committing subrepository sub - committing subrepository sub/subsub - -Ensure correct relative paths are used when pulling - - $ hg init r2 - $ cd r2/ - $ hg pull -u ../r1 - pulling from ../r1 - requesting all changes - adding changesets - adding manifests - adding file changes - added 1 changesets with 2 changes to 2 files - pulling subrepo sub from ../r1/sub - requesting all changes - adding changesets - adding manifests - adding file changes - added 1 changesets with 2 changes to 2 files - pulling subrepo sub/subsub from ../r1/sub/subsub - requesting all changes - adding changesets - adding manifests - adding file changes - added 1 changesets with 1 changes to 1 files - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ cd .. - -Verify subrepo default paths were set correctly - - $ hg -R r2/sub paths - default = $TESTTMP/r1/sub - $ cat r2/sub/.hg/hgrc - [paths] - default = ../../r1/sub - $ hg -R r2/sub/subsub paths - default = $TESTTMP/r1/sub/subsub - $ cat r2/sub/subsub/.hg/hgrc - [paths] - default = ../../../r1/sub/subsub