view tests/test-convert-hg-source.out @ 5567:56e9f7b2d8fa

rename: add test for moving untracked files in directories
author Matt Mackall <mpm@selenic.com>
date Sat, 01 Dec 2007 12:54:34 -0600
parents 11e1e574da02
children 180a3eee4b75
line wrap: on
line source

merging baz and foo
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
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
initializing destination new repository
scanning source...
sorting...
converting...
4 add foo bar
3 change foo
2 make bar and baz copies of foo
1 merge local copy
0 merge remote copy
comparing with ../orig
searching for changes
no changes found