Mercurial > public > mercurial-scm > hg-stable
diff tests/test-convert-hg-source.out @ 11673:a2f11188e2d2
convert: handle closed branch heads in hg-hg conversion (issue2185)
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sun, 25 Jul 2010 17:18:35 -0500 |
| parents | 314fc589b313 |
| children |
line wrap: on
line diff
--- a/tests/test-convert-hg-source.out Sun Jul 25 17:10:32 2010 -0500 +++ b/tests/test-convert-hg-source.out Sun Jul 25 17:18:35 2010 -0500 @@ -7,16 +7,19 @@ 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) created new head +marked working directory as branch foo initializing destination new repository scanning source... sorting... converting... -5 add foo bar -4 change foo -3 make bar and baz copies of foo -2 merge local copy -1 merge remote copy -0 mark baz executable +7 add foo bar +6 change foo +5 make bar and baz copies of foo +4 merge local copy +3 merge remote copy +2 mark baz executable +1 branch foo +0 close comparing with ../orig searching for changes no changes found