git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Paul Harris <harris.pc@gmail.com>
To: git@vger.kernel.org
Subject: subtree woes
Date: Tue, 5 Jun 2012 15:09:19 +0800	[thread overview]
Message-ID: <CAMSUDdZAex23k7c94VaF7H9KuGxE01sFC6XCHq4c=7jUnms7-Q@mail.gmail.com> (raw)
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

       reply	other threads:[~2012-06-05  7:10 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <CAMSUDdYj=GJx3LwSq98bLLXpEDWjR9ssHi=rdh1Q=zopZzAm_w@mail.gmail.com>
     [not found] ` <CAMSUDdZ0BX8E26haZ-V-Grm42PaWFm3eXuSAJBcUg1LFvis7mA@mail.gmail.com>
     [not found]   ` <CAMSUDdaKu7f+A3wwsWDOA1W071xunssixrWwCi1Uz21k4DFcBQ@mail.gmail.com>
2012-06-05  7:09     ` Paul Harris [this message]
2012-06-07  7:33       ` subtree woes Herman van Rink
2012-06-05  7:14     ` Paul Harris

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAMSUDdZAex23k7c94VaF7H9KuGxE01sFC6XCHq4c=7jUnms7-Q@mail.gmail.com' \
    --to=harris.pc@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).