branch | stable |
changeset 16039 | 093b75c7b44b |
parent 15636 | 4841035f37b6 |
child 16073 | b254f827b7a6 |
child 16107 | a3dcc59054ca |
--- a/tests/test-subrepo.t Mon Jan 30 15:56:35 2012 -0600 +++ b/tests/test-subrepo.t Mon Jan 30 16:01:54 2012 -0600 @@ -580,6 +580,7 @@ cloning subrepo s from $TESTTMP/sub/repo/s (glob) 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg -q -R repo2 pull -u + [1] $ echo 1 > repo2/s/a $ hg -R repo2/s ci -m2 $ hg -q -R repo2/s push @@ -638,6 +639,7 @@ pulling from issue1852a searching for changes no changes found + [1] Try the same, but with pull -u