Mercurial > public > mercurial-scm > hg-stable
diff tests/test-convert-hg-source.out @ 6336:4b0c9c674707
warn about new heads on commit (issue842)
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
|---|---|
| date | Fri, 21 Mar 2008 11:06:02 +0100 |
| parents | 180a3eee4b75 |
| children | 368a4ec603cc |
line wrap: on
line diff
--- a/tests/test-convert-hg-source.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-convert-hg-source.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,3 +1,4 @@ +created new head merging baz and foo 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) @@ -5,6 +6,7 @@ merging foo and baz 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) +created new head initializing destination new repository scanning source... sorting...