sapling/tests/test-convert-bzr.out

57 lines
1.1 KiB
Plaintext
Raw Normal View History

2008-09-26 22:33:47 +04:00
% create and rename on the same file in the same step
a => b
c => d
2008-09-26 22:33:47 +04:00
initializing destination source-hg repository
scanning source...
sorting...
converting...
1 Initial add: a, c
0 rename a into b, create a, rename c into d
o 1 "rename a into b, create a, rename c into d" files: a b c d
2008-09-26 22:33:47 +04:00
|
o 0 "Initial add: a, c" files: a c
2008-09-26 22:33:47 +04:00
% manifest
a
b
d
2008-09-26 22:33:47 +04:00
% test --rev option
initializing destination source-1-hg repository
scanning source...
sorting...
converting...
0 Initial add: a, c
o 0 "Initial add: a, c" files: a c
2008-09-26 22:33:47 +04:00
% merge
initializing destination source-hg repository
scanning source...
sorting...
converting...
3 Initial add
2 Editing a
1 Editing b
0 Merged improve branch
o 3 "Merged improve branch" files:
|\
| o 2 "Editing b" files: b
| |
o | 1 "Editing a" files: a
|/
o 0 "Initial add" files: a b
% symlinks and executable files
initializing destination source-hg repository
scanning source...
sorting...
converting...
1 Initial setup
0 Symlink changed, x bits changed
% manifest of 0
644 altname
755 * program
% manifest of tip
644 altname
755 * newprog
644 program