Artifact 4a3361377956d4e51f2ee933582ffc610d10bdfe:

Ticket change [4a33613779] - New ticket [aa01499923] Merge tests fail on NetBSD and Mac OS/X 10.6.4. by chi 2010-10-29 03:56:44.

---

D 2010-10-29T03:56:44
J comment If\sI\sperform\sthe\sunit\stests\sFossil\sis\scoming\swith\svia\r\n<verbatim>\r\n\s\s\smake\stest\r\n</verbatim>\r\nthen\sthe\stest\srun\sfails\swith\s33\serrors\sconcerning\smerging.\sThe\smessage\sis:\r\n<verbatim>\r\n\s\s33\serrors:\smerge1-2.1\smerge1-2.2\smerge1-4.1\smerge1-4.2\smerge1-7.1\smerge1-7.2\smerge3-3\r\n\s\smerge3-4\smerge3-5\smerge3-6\smerge3-7\smerge3-8\smerge3-11\smerge3-24\smerge3-25\smerge3-34\s\r\n\s\smerge3-35\smerge3-44\smerge3-45\smerge3-54\smerge3-55\smerge3-64\smerge3-65\smerge3-74\s\r\n\s\smerge3-75\smerge3-84\smerge3-85\smerge3-94\smerge3-95\smerge3-103\smerge3-104\smerge3-1000\s\r\n\s\smerge3-1002\r\n</verbatim>\r\n\r\nThe\serror\soutput\sof\sthe\sfailed\stests\sis\ssimilar\slike\sthis:\r\n<verbatim>\r\n\s\s~/Project/fossil/fossil\stest-3-way-merge\st1\st2\st3\st4\r\n\s\s~/Project/fossil/fossil\stest-3-way-merge\st1\st3\st2\st5\r\n\s\s\s\sExpected\s[>\s2b\s3b\s4b\s5\s6b\s7b\s8b\s=\s2\s3\s4c\s5c\s6c\s7\s8\s<]\r\n\s\s\s\s\s\s\s\s\sGot\s[{<<<<<<<\sBEGIN\sMERGE\sCONFLICT}\s2b\s3b\s4b\s5\s6b\s7b\s8b\s=\s2\s3\s4c\s5c\s6c\s7\s8\s{>>>>>>>\sEND\s\sMERGE\sCONFLICT}]\r\n\s\s\s\stest\smerge3-1002\sFAILED!\r\n</verbatim>\r\n\r\nIf\smore\sinformation\sis\snecessary,\splease\slet\sme\sknow\s...
J foundin d03718ad5f
J private_contact 63f4cb9d6971f7dbdee05412b8546975182b32e4
J severity Severe
J status Open
J title Merge\stests\sfail\son\sNetBSD\sand\sMac\sOS/X\s10.6.4
J type Build_Problem
K aa01499923bd622758a4e7ed3770827bc9e02bc2
U chi
Z da90286933f4405e7843a637a14ed277