{"thread":{"id":"2754","subject":"Cygwin test failure in t6021-merge-criss-cross.sh","startedAt":"2005-12-06T12:40:32Z","lastAt":"2005-12-06T17:10:38Z","messageCount":3,"participants":["Tim O'Callaghan","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"13263","messageId":"20051206124032.GC2364@ELSAMSW37164","threadId":"2754","inReplyTo":null,"subject":"Cygwin test failure in t6021-merge-criss-cross.sh","fromName":"Tim O'Callaghan","fromEmail":"timo@dspsrv.com","sentAt":"2005-12-06T12:40:32Z","receivedAt":"2005-12-06T12:40:32Z","isPatch":false,"sender":{"key":"timo@dspsrv.com","avatar":null},"body":"I tried build-testing the latest version of git, and the tests reported\nthis error:\n---------\n*** t6021-merge-criss-cross.sh ***\n* FAIL 1: prepare repository\n        echo \"1\n        2\n        3\n        4\n        5\n        6\n        7\n        8\n        9\" > file &&\n        git add file &&\n        git commit -m \"Initial commit\" file &&\n        git branch A &&\n        git branch B &&\n        git checkout A &&\n        echo \"1\n        2\n        3\n        4\n        5\n        6\n        7\n        8 changed in B8, branch A\n        9\" > file &&\n        git commit -m \"B8\" file &&\n        git checkout B &&\n        echo \"1\n        2\n        3 changed in C3, branch B\n        4\n        5\n        6\n        7\n        8\n        9\n        \" > file &&\n        git commit -m \"C3\" file &&\n        git branch C3 &&\n        git merge \"pre E3 merge\" B A &&\n        echo \"1\n        2\n        3 changed in E3, branch B. New file size\n        4\n        5\n        6\n        7\n        8 changed in B8, branch A\n        9\n        \" > file &&\n        git commit -m \"E3\" file &&\n        git checkout A &&\n        git merge \"pre D8 merge\" A C3 &&\n        echo \"1\n        2\n        3 changed in C3, branch B\n        4\n        5\n        6\n        7\n        8 changed in D8, branch A. New file size 2\n        9\" > file &&\n        git commit -m D8 file\n* FAIL 2: Criss-cross merge\n        git merge \"final merge\" A B\n* FAIL 3: Criss-cross merge result\n        cmp file file-expect\n* failed 3 among 3 test(s)\nmake[1]: *** [t6021-merge-criss-cross.sh] Error 1\nmake[1]: Leaving directory `/cygdrive/c/home/tim/projects/CygwinPorts/git_git/t'\nmake: *** [test] Error 2\n----\n\nIs there any more information i need to provide? \n\nTim.\n\"I've worked myself up from nothing to a state of supreme poverty.\"\n-- Groucho Marx\n"},{"id":"13268","messageId":"7v1x0q419j.fsf@assigned-by-dhcp.cox.net","threadId":"2754","inReplyTo":"20051206124032.GC2364@ELSAMSW37164","subject":"Re: Cygwin test failure in t6021-merge-criss-cross.sh","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-12-06T16:51:36Z","receivedAt":"2005-12-06T16:51:36Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"I have this strange feeling that you do not have \"merge\"\ninstalled on your cygwin box.  It is part of \"rcs\".\n\nWhen you see a test failure, it sometimes useful to try running:\n\n    $ cd t\n    $ sh ./t6021-*.sh -i -v\n\nmanually.\n"},{"id":"13270","messageId":"20051206171037.GH2364@ELSAMSW37164","threadId":"2754","inReplyTo":"7v1x0q419j.fsf@assigned-by-dhcp.cox.net","subject":"Re: Cygwin test failure in t6021-merge-criss-cross.sh","fromName":"Tim O'Callaghan","fromEmail":"timo@dspsrv.com","sentAt":"2005-12-06T17:10:38Z","receivedAt":"2005-12-06T17:10:38Z","isPatch":false,"sender":{"key":"timo@dspsrv.com","avatar":null},"body":"On Tue, Dec 06, 2005 at 08:51:36AM -0800, Junio C Hamano wrote:\n> I have this strange feeling that you do not have \"merge\"\n> installed on your cygwin box.  It is part of \"rcs\".\n> \n\nThanks, that was it. Another dependency to add to git-core :)\n\n> When you see a test failure, it sometimes useful to try running:\n> \n>     $ cd t\n>     $ sh ./t6021-*.sh -i -v\n> \n> manually.\n> \n\nDuly noted.\n\nTim.\n\"I've worked myself up from nothing to a state of supreme poverty.\"\n-- Groucho Marx\n"}]}