{"thread":{"id":"30712","subject":"subtree woes","startedAt":"2012-06-05T07:09:19Z","lastAt":"2012-06-07T07:33:56Z","messageCount":3,"participants":["Paul Harris","Herman van Rink"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"192873","messageId":"CAMSUDdZAex23k7c94VaF7H9KuGxE01sFC6XCHq4c=7jUnms7-Q@mail.gmail.com","threadId":"30712","inReplyTo":"CAMSUDdaKu7f+A3wwsWDOA1W071xunssixrWwCi1Uz21k4DFcBQ@mail.gmail.com","subject":"subtree woes","fromName":"Paul Harris","fromEmail":"harris.pc@gmail.com","sentAt":"2012-06-05T07:09:19Z","receivedAt":"2012-06-05T07:09:19Z","isPatch":false,"sender":{"key":"harris.pc@gmail.com","avatar":null},"body":"Hello,\n\nI'm shifting my projects to use a subtree system, and I'm having some trouble.\nLooks like I'm hitting a subtree-merge bug, although I thought they\nwere all fixed by now.\n\nI'm using cygwin, git 1.7.9 and apenwarr's git-subtrees repo.\nI've also tried git 1.7.10.msysgit.1 with apenwarr's git-subtrees.\n\nI've created a repo on github with a test:\nhttps://github.com/paulharris/subtree_test\n\nThe procedure is described in the readme, and has the results too.\n\nIn short, I set up a superproject, with some subproject/subtrees.\nI have a branch that is my subtree, and now I want to merge it,\nlike so:\ngit subtree merge -P zlib origin/subtrees/zlib\n\nInstead of merging the subfolder, it clears the super-project and all\nI am left with is the zlib project !\n\nthanks!\nPaul\n"},{"id":"192874","messageId":"CAMSUDdaZ1W0h2D_yGnei3rOEYJXDkuCYJms1yHTwYHBFEKvcFQ@mail.gmail.com","threadId":"30712","inReplyTo":"CAMSUDdaKu7f+A3wwsWDOA1W071xunssixrWwCi1Uz21k4DFcBQ@mail.gmail.com","subject":"subtree woes","fromName":"Paul Harris","fromEmail":"harris.pc@gmail.com","sentAt":"2012-06-05T07:14:21Z","receivedAt":"2012-06-05T07:14:21Z","isPatch":false,"sender":{"key":"harris.pc@gmail.com","avatar":null},"body":"Hello,\n\nI'm shifting my projects to use a subtree system, and I'm having some trouble.\nLooks like I'm hitting a subtree-merge bug, although I thought they\nwere all fixed by now.\n\nI'm using cygwin, git 1.7.9 and apenwarr's git-subtrees repo.\nI've also tried git 1.7.10.msysgit.1 with apenwarr's git-subtrees.\n\nI've created a repo on github with a test:\nhttps://github.com/paulharris/subtree_test\n\nThe procedure is described in the readme, and has the results too.\n\nIn short, I set up a superproject, with some subproject/subtrees.\nI have a branch that is my subtree, and now I want to merge it,\nlike so:\ngit subtree merge -P zlib origin/subtrees/zlib\n\nInstead of merging the subfolder, it clears the super-project and all\nI am left with is the zlib project !\n\nthanks!\nPaul\n"},{"id":"193034","messageId":"4FD05964.9040102@initfour.nl","threadId":"30712","inReplyTo":"CAMSUDdZAex23k7c94VaF7H9KuGxE01sFC6XCHq4c=7jUnms7-Q@mail.gmail.com","subject":"Re: subtree woes","fromName":"Herman van Rink","fromEmail":"rink@initfour.nl","sentAt":"2012-06-07T07:33:56Z","receivedAt":"2012-06-07T07:33:56Z","isPatch":false,"sender":{"key":"rink@initfour.nl","avatar":null},"body":"On 05-06-12 09:09, Paul Harris wrote:\n> Hello,\n>\n> I'm shifting my projects to use a subtree system, and I'm having some trouble.\n> Looks like I'm hitting a subtree-merge bug, although I thought they\n> were all fixed by now.\n>\n> I'm using cygwin, git 1.7.9 and apenwarr's git-subtrees repo.\n> I've also tried git 1.7.10.msysgit.1 with apenwarr's git-subtrees.\n\n\nYour origin/subtrees/zlib branch contains the zlib directory, not the\njust the contents of that directory.\n\nPlease have a look in the contrib/subtree folder of git-core.\nWork is ongoing to integrate apenwarr's code.\n\nMy latest stuff is in: https://github.com/helmo/git\n\n-- \nMet vriendelijke groet / Regards,\n\nHerman van Rink \nInitfour websolutions\n"}]}