Mercurial > hg-stable
diff tests/test-subrepo-git.t @ 13569:3ab3b892d223
subrepo: show the source that git pulls
author | Eric Eisner <ede@mit.edu> |
---|---|
date | Tue, 08 Mar 2011 15:36:56 -0500 |
parents | a2734c8322ac |
children | b2ee161328e0 |
line wrap: on
line diff
--- a/tests/test-subrepo-git.t Tue Mar 08 08:41:39 2011 -0500 +++ b/tests/test-subrepo-git.t Tue Mar 08 15:36:56 2011 -0500 @@ -155,7 +155,7 @@ added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) $ hg merge 2>/dev/null - pulling subrepo s + pulling subrepo s from $TESTTMP/gitroot 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ cat s/f @@ -232,7 +232,7 @@ $ cd ../tb $ hg pull -q $ hg update 2>/dev/null - pulling subrepo s + pulling subrepo s from $TESTTMP/gitroot 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg debugsub path s @@ -262,7 +262,7 @@ $ cd ../tc $ hg pull -q $ hg archive --subrepos -r 5 ../archive 2>/dev/null - pulling subrepo s + pulling subrepo s from $TESTTMP/gitroot $ cd ../archive $ cat s/f f