##// END OF EJS Templates
tests: strip o/s-dependent error messages from some http tests
tests: strip o/s-dependent error messages from some http tests

File last commit:

r7053:209ef5f3 default
r7903:490e4081 default
Show More
test-convert-bzr-merges.out
27 lines | 584 B | text/plain | TextLexer
/ tests / test-convert-bzr-merges.out
% test multiple merges at once
initializing destination source-hg repository
scanning source...
sorting...
converting...
4 Initial add
3 Added branch1 file
2 Added parent file
1 Added brach2 file
0 Merged branches
o 5 "(octopus merge fixup)" files:
|\
| o 4 "Merged branches" files: file-branch2
| |\
o---+ 3 "Added brach2 file" files: file-branch2
/ /
| o 2 "Added parent file" files: file-parent
| |
o | 1 "Added branch1 file" files: file file-branch1
|/
o 0 "Initial add" files: file
% manifest of tip
644 file
644 file-branch1
644 file-branch2
644 file-parent