# subtree woes 3 messages from 2012-06-05 to 2012-06-07. Participants: Paul Harris, Herman van Rink. Thread: https://gitlist.dev/t/30712 ## Paul Harris, 2012-06-05 07:09 Subject: subtree woes Message-ID: URL: https://gitlist.dev/e/CAMSUDdZAex23k7c94VaF7H9KuGxE01sFC6XCHq4c%3D7jUnms7-Q%40mail.gmail.com In-Reply-To: ``` Hello, I'm shifting my projects to use a subtree system, and I'm having some trouble. Looks like I'm hitting a subtree-merge bug, although I thought they were all fixed by now. I'm using cygwin, git 1.7.9 and apenwarr's git-subtrees repo. I've also tried git 1.7.10.msysgit.1 with apenwarr's git-subtrees. I've created a repo on github with a test: https://github.com/paulharris/subtree_test The procedure is described in the readme, and has the results too. In short, I set up a superproject, with some subproject/subtrees. I have a branch that is my subtree, and now I want to merge it, like so: git subtree merge -P zlib origin/subtrees/zlib Instead of merging the subfolder, it clears the super-project and all I am left with is the zlib project ! thanks! Paul ``` ## Paul Harris, 2012-06-05 07:14 Subject: subtree woes Message-ID: URL: https://gitlist.dev/e/CAMSUDdaZ1W0h2D_yGnei3rOEYJXDkuCYJms1yHTwYHBFEKvcFQ%40mail.gmail.com In-Reply-To: ``` Hello, I'm shifting my projects to use a subtree system, and I'm having some trouble. Looks like I'm hitting a subtree-merge bug, although I thought they were all fixed by now. I'm using cygwin, git 1.7.9 and apenwarr's git-subtrees repo. I've also tried git 1.7.10.msysgit.1 with apenwarr's git-subtrees. I've created a repo on github with a test: https://github.com/paulharris/subtree_test The procedure is described in the readme, and has the results too. In short, I set up a superproject, with some subproject/subtrees. I have a branch that is my subtree, and now I want to merge it, like so: git subtree merge -P zlib origin/subtrees/zlib Instead of merging the subfolder, it clears the super-project and all I am left with is the zlib project ! thanks! Paul ``` ## Herman van Rink, 2012-06-07 07:33 Subject: Re: subtree woes Message-ID: <4FD05964.9040102@initfour.nl> URL: https://gitlist.dev/e/4FD05964.9040102%40initfour.nl In-Reply-To: ``` On 05-06-12 09:09, Paul Harris wrote: > Hello, > > I'm shifting my projects to use a subtree system, and I'm having some trouble. > Looks like I'm hitting a subtree-merge bug, although I thought they > were all fixed by now. > > I'm using cygwin, git 1.7.9 and apenwarr's git-subtrees repo. > I've also tried git 1.7.10.msysgit.1 with apenwarr's git-subtrees. Your origin/subtrees/zlib branch contains the zlib directory, not the just the contents of that directory. Please have a look in the contrib/subtree folder of git-core. Work is ongoing to integrate apenwarr's code. My latest stuff is in: https://github.com/helmo/git -- Met vriendelijke groet / Regards, Herman van Rink Initfour websolutions ```