Call for testing: mercurial 1.1

[Dirkjan Ochtman]

On Wed, Nov 26, 2008 at 15:12, Gilles Moris <gilles.moris at free.fr> wrote:
> ERROR: test-convert-bzr-merges output changed
> --- Expected output
> +++ Test output
> @@ -4,19 +4,19 @@
>  sorting...
>  converting...
>  4 Initial add
> -3 Added branch1 file
> -2 Added parent file
> +3 Added parent file
> +2 Added branch1 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 | |  3 "Added brach2 file" files: file-branch2
> +|/ /
> +| o  2 "Added branch1 file" files: file file-branch1
>  | |
> -o |  1 "Added branch1 file" files: file file-branch1
> +o |  1 "Added parent file" files: file-parent
>  |/
>  o  0 "Initial add" files: file

I get that one, sometimes, but the guy who did the bzr support in
convert can't reproduce it, and it's apparently fairly harmless.

Cheers,

Dirkjan