git/list[1] front-page[2] threads[3] people[4] search[5] about
 

subtree woes

From
PHPaul Harris <harris.pc@gmail.com>
Date
Jun 5, 2012, 07:09 UTC
Message-ID
<CAMSUDdZAex23k7c94VaF7H9KuGxE01sFC6XCHq4c=7jUnms7-Q@mail.gmail.com>
In-Reply-To
<CAMSUDdaKu7f+A3wwsWDOA1W071xunssixrWwCi1Uz21k4DFcBQ@mail.gmail.com>
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

Next: Herman van Rink
Message 1 of 3 in “subtree woes”
  1. Paul HarrisJun 5, 2012
  2. Herman van RinkJun 7, 2012
  3. Paul HarrisJun 5, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.