threads / discuss / 30712

subtree woes

Subject: subtree woes

## tl;dr

3 messages between Jun 5, 2012 and Jun 7, 2012.

replies: 2people: 2as markdown or json

Paul Harris· Jun 5, 2012, 07:09 UTC · lore
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· Jun 7, 2012, 07:33 UTC · re: Paul Harris · lore

Re: subtree woes

On 05-06-12 09:09, Paul Harris wrote:
Show 8 quoted lines
> 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
Paul Harris· Jun 5, 2012, 07:14 UTC · lore
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

← back to recent threads