Mercurial > public > mercurial-scm > hg-stable
diff tests/test-fetch.out @ 7855:aa1a87f7544f
regression test for issue1552
Ensures that fetch correctly infers what to merge when pulling a
repository with inactive branches.
| author | Benjamin Pollack <benjamin@bitquabit.com> |
|---|---|
| date | Tue, 17 Mar 2009 11:34:40 -0400 |
| parents | 6163ef936a00 |
| children | 0b2b269ba3d0 |
line wrap: on
line diff
--- a/tests/test-fetch.out Tue Mar 17 11:47:40 2009 -0400 +++ b/tests/test-fetch.out Tue Mar 17 11:34:40 2009 -0400 @@ -178,3 +178,15 @@ abort: working dir not at branch tip (use "hg update" to check out branch tip) % parent should be 0 (fetch did not update or merge anything) 0 +% test fetch with inactive branches +adding a +marked working directory as branch second +adding b +marked working directory as branch default +adding c +updating working directory +3 files updated, 0 files merged, 0 files removed, 0 files unresolved +% fetch should succeed +pulling from ../ib1 +searching for changes +no changes found