view tests/test-convert-bzr-merges.out @ 8964:119d1f664eae

extensions: catch OSError when hgext is not accessible (issue1708) Temporary workaround for issue1708: on win32 with py2exe, hgext is distributed inside a zipped file (which anyway does not contain the py files from which we ought to extract the documentation strings), which raises a WindowsError (subclasses OSError). This means that on such platforms the list of disabled extensions won't be available. Real fix postponed for after Mercurial 1.3.
author Cédric Duval <cedricduval@free.fr>
date Mon, 29 Jun 2009 19:28:54 +0200
parents 209ef5f3534c
children
line wrap: on
line source

% 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