From: David Aguilar <davvid@gmail.com>
To: greened@obbligato.org
Cc: git@vger.kernel.org
Subject: Re: New git-subtree almost ready
Date: Sat, 24 Mar 2012 01:00:42 -0700 [thread overview]
Message-ID: <CAJDDKr6VSgZksGkXg2oW4nwWCggW1M5TapiyeH-rAkfo+FjnmQ@mail.gmail.com> (raw)
In-Reply-To: <87limu7hhi.fsf@smith.obbligato.org>
On Tue, Mar 20, 2012 at 8:36 PM, <greened@obbligato.org> wrote:
> I've got the git-subtree merge in pretty good shape now. After being
> taught about TEST_DIRECTORY, I've been able to get rid of all of the
> test system changes and can run the git-subtree tests using the stock
> test infrastructure.
>
> Before I can put the new tree up I need a little help. Since it's been
> a while since I posted the last version of the tree, I tried to update
> from upstream master. git-subtree is in a separate branch (it wqas
> applied as a subtree merge) so I did the usual switch-to-master-and-pull
> thing.
>
> However, now I don't know how to rebase from master to the subtree
> branch. If I do a "git rebase master" then the subtree merge gets
> re-applied as if the files were placed in the root directory rather than
> in the target directory of the original subtree merge.
>
> The problem is described pretty well here and the issue has been covered
> on the mailing list before:
>
> http://groups.google.com/group/git-users/browse_thread/thread/d54bacd234d95639
> http://comments.gmane.org/gmane.comp.version-control.git/191934
>
> I can think of a few strategies to move forward.
>
> 1. Keep the git-subtree branch where it is. Don't rebase and just push
> the branch to a public repository. Make Junio do the hard work. :)
Hehe, I'm pretty sure the option that involves Junio doing the least
amount of work is the option to take ;-)
> 2. Split the subtree merge, remove it from the git repository, rebase
> from master and then re-subtree-merge it.
I don't know if git-gui or gitk maintainers have advice for you, but
it sounds like this may be the best option, IMO. git-subtree is not
yet part of the git history.
git is in a RC cycle right now, which is likely why you have not heard
much on this topic (new feature). Folks will be busy testing the RC
and ensuring we have no regressions.
Looking forward to git-subtree,
--
David
prev parent reply other threads:[~2012-03-24 8:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-21 3:36 New git-subtree almost ready greened
2012-03-24 3:34 ` greened
2012-03-24 8:00 ` David Aguilar [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAJDDKr6VSgZksGkXg2oW4nwWCggW1M5TapiyeH-rAkfo+FjnmQ@mail.gmail.com \
--to=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=greened@obbligato.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.
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 NNTP newsgroup(s).