* subtree woes
[not found] ` <CAMSUDdaKu7f+A3wwsWDOA1W071xunssixrWwCi1Uz21k4DFcBQ@mail.gmail.com>
@ 2012-06-05 7:09 ` Paul Harris
2012-06-07 7:33 ` Herman van Rink
2012-06-05 7:14 ` Paul Harris
1 sibling, 1 reply; 3+ messages in thread
From: Paul Harris @ 2012-06-05 7:09 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: subtree woes
2012-06-05 7:09 ` subtree woes Paul Harris
@ 2012-06-07 7:33 ` Herman van Rink
0 siblings, 0 replies; 3+ messages in thread
From: Herman van Rink @ 2012-06-07 7:33 UTC (permalink / raw)
To: Paul Harris; +Cc: Git Users
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* subtree woes
[not found] ` <CAMSUDdaKu7f+A3wwsWDOA1W071xunssixrWwCi1Uz21k4DFcBQ@mail.gmail.com>
2012-06-05 7:09 ` subtree woes Paul Harris
@ 2012-06-05 7:14 ` Paul Harris
1 sibling, 0 replies; 3+ messages in thread
From: Paul Harris @ 2012-06-05 7:14 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] 3+ messages in thread