Cygwin test failure in t6021-merge-criss-cross.sh

Cygwin test failure in t6021-merge-criss-cross.sh

[Tim O'Callaghan]

I tried build-testing the latest version of git, and the tests reported
this error:
---------
*** t6021-merge-criss-cross.sh ***
* FAIL 1: prepare repository
        echo "1
        2
        3
        4
        5
        6
        7
        8
        9" > file &&
        git add file &&
        git commit -m "Initial commit" file &&
        git branch A &&
        git branch B &&
        git checkout A &&
        echo "1
        2
        3
        4
        5
        6
        7
        8 changed in B8, branch A
        9" > file &&
        git commit -m "B8" file &&
        git checkout B &&
        echo "1
        2
        3 changed in C3, branch B
        4
        5
        6
        7
        8
        9
        " > file &&
        git commit -m "C3" file &&
        git branch C3 &&
        git merge "pre E3 merge" B A &&
        echo "1
        2
        3 changed in E3, branch B. New file size
        4
        5
        6
        7
        8 changed in B8, branch A
        9
        " > file &&
        git commit -m "E3" file &&
        git checkout A &&
        git merge "pre D8 merge" A C3 &&
        echo "1
        2
        3 changed in C3, branch B
        4
        5
        6
        7
        8 changed in D8, branch A. New file size 2
        9" > file &&
        git commit -m D8 file
* FAIL 2: Criss-cross merge
        git merge "final merge" A B
* FAIL 3: Criss-cross merge result
        cmp file file-expect
* failed 3 among 3 test(s)
make[1]: *** [t6021-merge-criss-cross.sh] Error 1
make[1]: Leaving directory `/cygdrive/c/home/tim/projects/CygwinPorts/git_git/t'
make: *** [test] Error 2
----

Is there any more information i need to provide? 

Tim.
"I've worked myself up from nothing to a state of supreme poverty."
-- Groucho Marx

Re: Cygwin test failure in t6021-merge-criss-cross.sh

[Junio C Hamano]

I have this strange feeling that you do not have "merge"
installed on your cygwin box.  It is part of "rcs".

When you see a test failure, it sometimes useful to try running:

    $ cd t
    $ sh ./t6021-*.sh -i -v

manually.

Re: Cygwin test failure in t6021-merge-criss-cross.sh

[Tim O'Callaghan]

On Tue, Dec 06, 2005 at 08:51:36AM -0800, Junio C Hamano wrote:
> I have this strange feeling that you do not have "merge"
> installed on your cygwin box.  It is part of "rcs".
> 

Thanks, that was it. Another dependency to add to git-core :)

> When you see a test failure, it sometimes useful to try running:
> 
>     $ cd t
>     $ sh ./t6021-*.sh -i -v
> 
> manually.
> 

Duly noted.

Tim.
"I've worked myself up from nothing to a state of supreme poverty."
-- Groucho Marx