{"thread":{"id":"497","subject":"[ISSUE RESOLVED] Problems with threeway diff, checkout-cache and permissions of two blobs","startedAt":"2005-05-06T11:17:46Z","lastAt":"2005-05-06T11:17:46Z","messageCount":1,"participants":["Thomas Glanzmann"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"2660","messageId":"20050506111746.GE11506@cip.informatik.uni-erlangen.de","threadId":"497","inReplyTo":null,"subject":"[ISSUE RESOLVED] Problems with threeway diff, checkout-cache and permissions of two blobs","fromName":"Thomas Glanzmann","fromEmail":"sithglan@stud.uni-erlangen.de","sentAt":"2005-05-06T11:17:46Z","receivedAt":"2005-05-06T11:17:46Z","isPatch":false,"sender":{"key":"sithglan@stud.uni-erlangen.de","avatar":null},"body":"Hello,\n\n\t[ *** ISSUE RESOLVED: Doesn't happen with GIT HEAD *** ]\n\nThe following issue is resolved. Just if someone hits the same problem:\n\nI did a merge with two conflicts, which can AFAIK automatically be\nresolved. However if I call 'git-checkout-cache -f -a' it fails on me:\n\n\t(faui01) [~/work/mutt/git/mutt-tg] git pull ../mutt-cstatus\n\thead => 8aa9f8e95f17213a583d28bbc80d15bba01a375d\n\tremote => b54cf35a50e50a8e1bf09f79b714d0f18c8f3c92\n\tbase => e8f4a291a81f0a8fb24555f0e36e4b75e2d3f4c8\n\tcurs_main.c: unmerged (ff55f1869b953acb2ec816569470e4adb3421c1d)\n\tcurs_main.c: unmerged (b5c5275ead8882ed37205b92b2bc88f7799c2ac8)\n\tcurs_main.c: unmerged (335c5c978ac580b95168916deb297fb254592079)\n\tprotos.h: unmerged (3cda50538b733826e37cd35734e68755173f080c)\n\tprotos.h: unmerged (011d63023a7f1d718f90d87a4933c6f50d0fb1de)\n\tprotos.h: unmerged (66324e580002ebd6c9d974c4873cc215b6478029)\n\tfatal: write-tree: not able to write tree\n\tThreewaydiff invloved.\n\t<<\nThis is the error I get from git-checkout-cache the first time:\n\n\tfatal: internal error: ce_mode is 644\n\tgit-checkout-cache failed: child exit value: 1 at /home/cip/adm/sithglan/work/git/yagf/git line 942.\n\t(faui01) [~/work/mutt/git/mutt-tg] git-ls-tree HEAD | grep ^0 | grep blob\n\t000644 blob d43160b921f037dc45dba6cf80dd22520ac17c7e curs_main.c\n\t000644 blob 210fe03ed3004c45b9548c7f7d1e011bb216c468 protos.h\nNote    ^ while every else this is '1' for files.\n\n\t(faui01) [~/work/mutt/git/mutt-tg] rm -rf *\n\t(faui01) [~/work/mutt/git/mutt-tg] git-read-tree HEAD\n\t(faui01) [~/work/mutt/git/mutt-tg] git-checkout-cache -f -a\n\terror: checkout-cache: unknown file mode for curs_main.c\n\n\tThomas\n"}]}