{"thread":{"id":"3929","subject":"t1001-read-tree-m-2way.sh failed","startedAt":"2006-04-20T13:01:21Z","lastAt":"2006-04-20T13:53:58Z","messageCount":3,"participants":["Sven Verdoolaege","Andreas Ericsson"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"18917","messageId":"20060420130121.GO11428MdfPADPa@greensroom.kotnet.org","threadId":"3929","inReplyTo":null,"subject":"t1001-read-tree-m-2way.sh failed","fromName":"Sven Verdoolaege","fromEmail":"skimo@kotnet.org","sentAt":"2006-04-20T13:01:21Z","receivedAt":"2006-04-20T13:01:21Z","isPatch":false,"sender":{"key":"skimo@kotnet.org","avatar":null},"body":"*** t1001-read-tree-m-2way.sh ***\n* FAIL 1: setup\n        echo frotz >frotz &&\n             echo nitfol >nitfol &&\n             cat bozbar-old >bozbar &&\n             echo rezrov >rezrov &&\n             echo yomin >yomin &&\n             git-update-index --add nitfol bozbar rezrov &&\n             treeH=`git-write-tree` &&\n             echo treeH $treeH &&\n             git-ls-tree $treeH &&\n\n             cat bozbar-new >bozbar &&\n             git-update-index --add frotz bozbar --force-remove rezrov &&\n             git-ls-files --stage >M.out &&\n             treeM=`git-write-tree` &&\n             echo treeM $treeM &&\n             git-ls-tree $treeM &&\n             git-diff-tree $treeH $treeM\n*   ok 2: 1, 2, 3 - no carry forward\n*   ok 3: 4 - carry forward local addition.\n*   ok 4: 5 - carry forward local addition.\n*   ok 5: 6 - local addition already has the same.\n*   ok 6: 7 - local addition already has the same.\n*   ok 7: 8 - conflicting addition.\n*   ok 8: 9 - conflicting addition.\n*   ok 9: 10 - path removed.\n*   ok 10: 11 - dirty path removed.\n*   ok 11: 12 - unmatching local changes being removed.\n*   ok 12: 13 - unmatching local changes being removed.\n*   ok 13: 14 - unchanged in two heads.\n*   ok 14: 15 - unchanged in two heads.\n*   ok 15: 16 - conflicting local change.\n*   ok 16: 17 - conflicting local change.\n*   ok 17: 18 - local change already having a good result.\n*   ok 18: 19 - local change already having a good result, further modified.\n*   ok 19: 20 - no local change, use new tree.\n*   ok 20: 21 - no local change, dirty cache.\n*   ok 21: 22 - local change cache updated.\n*   ok 22: DF vs DF/DF case setup.\n*   ok 23: DF vs DF/DF case test.\n* failed 1 among 23 test(s)\n\nskimo\n"},{"id":"18918","messageId":"4447882F.8080304@op5.se","threadId":"3929","inReplyTo":"20060420130121.GO11428MdfPADPa@greensroom.kotnet.org","subject":"Re: t1001-read-tree-m-2way.sh failed","fromName":"Andreas Ericsson","fromEmail":"ae@op5.se","sentAt":"2006-04-20T13:10:07Z","receivedAt":"2006-04-20T13:10:07Z","isPatch":false,"sender":{"key":"ae@op5.se","avatar":"https://gravatar.com/avatar/426e89595c75a8f5252dd0c989e5fabe5bcac616e68557427ad9aef6b0ca342a?d=mp&s=160"},"body":"Platform?\nArchitecture?\ngit version?\nKeyboard color?\n\nThis report is missing lots of info. Fill in the missing parts and \nsomeone will almost certainly be able to help you.\n\nSven Verdoolaege wrote:\n> *** t1001-read-tree-m-2way.sh ***\n> * FAIL 1: setup\n>         echo frotz >frotz &&\n>              echo nitfol >nitfol &&\n>              cat bozbar-old >bozbar &&\n>              echo rezrov >rezrov &&\n>              echo yomin >yomin &&\n>              git-update-index --add nitfol bozbar rezrov &&\n>              treeH=`git-write-tree` &&\n>              echo treeH $treeH &&\n>              git-ls-tree $treeH &&\n> \n>              cat bozbar-new >bozbar &&\n>              git-update-index --add frotz bozbar --force-remove rezrov &&\n>              git-ls-files --stage >M.out &&\n>              treeM=`git-write-tree` &&\n>              echo treeM $treeM &&\n>              git-ls-tree $treeM &&\n>              git-diff-tree $treeH $treeM\n> * failed 1 among 23 test(s)\n> \n\n-- \nAndreas Ericsson                   andreas.ericsson@op5.se\nOP5 AB                             www.op5.se\nTel: +46 8-230225                  Fax: +46 8-230231\n"},{"id":"18920","messageId":"20060420135358.GQ11428MdfPADPa@greensroom.kotnet.org","threadId":"3929","inReplyTo":"4447882F.8080304@op5.se","subject":"Re: t1001-read-tree-m-2way.sh failed","fromName":"Sven Verdoolaege","fromEmail":"skimo@kotnet.org","sentAt":"2006-04-20T13:53:58Z","receivedAt":"2006-04-20T13:53:58Z","isPatch":false,"sender":{"key":"skimo@kotnet.org","avatar":null},"body":"On Thu, Apr 20, 2006 at 03:10:07PM +0200, Andreas Ericsson wrote:\n> Keyboard color?\n\nI think \"beige\" comes closest.\n\nIn any case, it turns out that apparently make was confused\nby the rename from diff.c to diff-lib.c.\nAfter a make clean, everything was ok.\n\nskimo\n"}]}