public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed
From: greened@obbligato•org (David A. Greene)
To: Jeff King <peff@peff•net>
Cc: Ramkumar Ramachandra <artagnon@gmail•com>,
	David Greene <dag@cray•com>,
	git@vger•kernel.org
Subject: Re: git-subtree
Date: Sun, 29 Jan 2012 16:07:59 -0600	[thread overview]
Message-ID: <87aa56kvr4.fsf@smith.obbligato.org> (raw)
In-Reply-To: <87zke2yv27.fsf@smith.obbligato.org> (David A. Greene's message of "Thu, 05 Jan 2012 10:26:40 -0600")

greened@obbligato•org (David A. Greene) writes:

>> I'd favor keeping the history and doing the munge-overlay thing.
>
> Ok, that sounds fine to me.  I'll do that in a private branch.  What
> should I send as patches to the mailing list?  I'm assuming we don't
> want [PATCH 235/12342], etc. sent to the list chronicling the entire
> history.  :)
>
>> Although part of me wants to join the histories in a subtree so that we
>> can use "git subtree" to do it (which would just be cool),
>
> Heh.  I thought about that too.  :)

I actually did end up doing a subtree merge via git subtree.  It was
more convenient to put it in contrib/ like that as almost everthing
there is in its own subdirectory.

I'm cleaning things up there to remove redundancy, rewrite tests (using
earlier work), etc.  What number should I use for git-subtree tests?
Here are some logical candidates:

        5 - the pull and exporting commands
        6 - the revision tree commands (even e.g. merge-base)
        7 - the porcelainish commands concerning the working tree
        9 - the git tools

git-subtree can pull and export.  It also affects revision trees (it
merges, for example) and is a porcelainish command that affects the
working tree.  It is also a "git tool" of a sort.

I originally put them under t97XX but now that is taken, as is
everything up to and including t99XX.

Anyone have a strong opinion?

Thanks!

                           -Dave

  reply	other threads:[~2012-01-30  6:40 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-04 15:53 git-subtree David Greene
2012-01-05 11:28 ` git-subtree Ramkumar Ramachandra
2012-01-05 15:03   ` git-subtree David A. Greene
2012-01-05 15:32     ` git-subtree Ramkumar Ramachandra
2012-01-05 16:33       ` git-subtree David A. Greene
2012-01-06  1:53         ` git-subtree David A. Greene
2012-01-05 22:18       ` git-subtree David A. Greene
2012-01-05 15:47     ` git-subtree Jeff King
2012-01-05 16:26       ` git-subtree David A. Greene
2012-01-29 22:07         ` David A. Greene [this message]
2012-01-30 16:56           ` git-subtree David A. Greene
2012-01-05 22:16       ` git-subtree David A. Greene
2012-01-05 15:53 ` git-subtree Junio C Hamano
2012-01-05 16:48   ` git-subtree David A. Greene
2012-01-05 22:19   ` git-subtree David A. Greene
  -- strict thread matches above, loose matches on Subject: below --
2021-11-14 10:11 git-subtree tqfx su
2021-11-15  8:12 ` git-subtree Fabian Stelzer

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=87aa56kvr4.fsf@smith.obbligato.org \
    --to=greened@obbligato$(echo .)org \
    --cc=artagnon@gmail$(echo .)com \
    --cc=dag@cray$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=peff@peff$(echo .)net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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