tests/test-convert-hg-source.out
author Christian Ebert <blacktrash@gmx.net>
Sat, 12 Jul 2008 19:12:10 +0100
changeset 7115 c5c2d43b01da
parent 6512 368a4ec603cc
child 7231 8e7130a10f3b
permissions -rw-r--r--
patchbomb: mime-encode headers and parts not containing patches Do nothing for "hg email --test" to preserve display.

created new head
merging baz and foo to baz
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
merging foo and baz to 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...
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
comparing with ../orig
searching for changes
no changes found