{"thread":{"id":"2106","subject":"failing test with cogito","startedAt":"2005-10-14T13:32:47Z","lastAt":"2005-10-14T13:32:47Z","messageCount":1,"participants":["Ivo Alxneit"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"10100","messageId":"200510141532.59897.ivo.alxneit@psi.ch","threadId":"2106","inReplyTo":null,"subject":"failing test with cogito","fromName":"Ivo Alxneit","fromEmail":"ivo.alxneit@psi.ch","sentAt":"2005-10-14T13:32:47Z","receivedAt":"2005-10-14T13:32:47Z","isPatch":false,"sender":{"key":"ivo.alxneit@psi.ch","avatar":null},"body":"hi\n\ni use\n\ncogito\ncommit 19e07806612d8cea5c8e343709d567fb796e2bb3\ngit\ncommit d06b689a933f6d2130f8afdf1ac0ddb83eeb59ab\n\nand the following tests fail for cogito (all tests pass in git)\n\n*** t9200-merge.sh ***\n* FAIL 17: merging branch2 to branch1 (automatic)\n        (cd branch1 && cg-merge </dev/null)\n* FAIL 18: checking for correct merged content\n        (cmp branch1/brm expect)\n* FAIL 23: checking for correct conflict content\n        (cmp brm-cleaned-up expect)\n\n*** t9202-merge-on-dirty.sh ***\n* FAIL 19: checking if we still have our local change\n        (cd branch1 && cg-status -w | grep -q \"^M foo\" && cmp foo foo-)\n* FAIL 36: merging branch2 to branch1 (automatic)\n        (cd branch1 && cg-merge </dev/null)\n* FAIL 37: checking if the working copy was touched by the merge\n        (cd branch1 && ! cmp brm brm-)\n* FAIL 38: checking if we still have our local change\n        (cd branch1 && cg-status -w | grep -q \"^M bar\" && cmp bar bar-)\n* FAIL 47: confirming that we have no uncommitted modifications\n        (cd branch1 && [ -z \"$(git-diff-index -r $(cg-object-id -t))\" ])\n* FAIL 50: checking if the merge caused a conflict\n        (cd branch1 && grep \"<<<\" brm)\n\n-- \nDr. Ivo Alxneit\nLaboratory for Solar Technology   phone: +41 56 310 4092\nPaul Scherrer Institute             fax: +41 56 310 2688\nCH-5232 Villigen                   http://solar.web.psi.ch\nSwitzerland                   gnupg key: 0x515E30C7\n"}]}