view tests/test-convert-bzr-merges.out @ 7958:73fa2be69ea9

Fix how setup.py identifies the Mercurial version.

There is a problem with setup.py where it will not identify the Mercurial
version properly when not being ran in within a repository even if
mercurial/__version__.py exists.

To fix, use mercurial.__version__.version when available before defaulting
to "unknown".  (Using mercurial.util.version() is not an option due to a
dependency issue where osutil can be referenced before it is built.)

% 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