From: "Boyd Stephen Smith Jr." <bss03@volumehost•net>
To: git@vger•kernel.org
Cc: Michael J Gruber <git@drmicha•warpmail.net>
Subject: Re: Grafting mis-aligned trees.
Date: Fri, 28 Nov 2008 17:01:41 -0600 [thread overview]
Message-ID: <200811281701.46778.bss03@volumehost.net> (raw)
In-Reply-To: <492289B0.4010903@drmicha.warpmail.net>
[-- Attachment #1: Type: text/plain, Size: 2827 bytes --]
On Tuesday 2008 November 18 03:24, Michael J Gruber wrote:
> Boyd Stephen Smith Jr. venit, vidit, dixit 17.11.2008 23:45:
> > I haven't gotten a response from my subscription email, so please CC me
> > on any replies.
> >
> > So, I've been managaing the source I had from a client project in git and
> > have a non-linear history. Currently, two tips (production and testing)
> > but there are many feature branches that were git-merge'd in, not
> > rebased.
> >
> > Now, I've gotten the full tree. Turns out all the source code I was
> > working on was in a subdirectory "project/web". I'd like to "graft" the
> > *changes* I made onto the full tree.
> >
> > I figured this might be a job for git-filter-branch. Certainly, that did
> > the job of moving all my changes into the subdirectory. But, now I want
> > to do something that's a combination or git-rebase and git-filter-branch.
> > I want to replay the *patches/deltas* (like rebase) on top of the full
> > tree I have, but *maintain the non-liear history* (like filter-branch).
> >
> > Can anyone think of a recipe for me?
> >
> > Trees look something like this right now.
> >
> > <some history> -> FT
> >
> > TI -> <non-linear history> -> A -> <non-linear history> -> C
> > \ \ \
> > -> PI ------------------------> B ------------------------> D
> >
> > I'd like to have it look something like:
> >
> > <some history> -> FT -> <non-linear history> -> A' -> <non-linear
> > history> -> C' \ \ \
> > -> PI' ----------------------> B' -----------------------> D'
> >
> > A', B', C', and D' are different commits, but the diff (and history)
> > between FT and A' is the same as the diff (and history) between TI and A.
> >
> > Again, please CC me on any replies.
>
> [CCing is customary here anyways.]
>
> So, your base directory for TI and FT is different, right? I.e.: In the
> TI repo, your project sits at the root, whereas in the FT repo it sits
> in project/web?
Yes.
> Has FT advanced since you took the initial subdir
> snapshot for TI?
No. Well, maybe. I think the subdir diff is fairly trivial if not empty. TI
is an import from the code actually present on the testing server. FT was
the a subversion repository obtained later after some hullabaloo with the
ex-development house.
Right now this tree is effectively all mine, so I can always graft in commits
to synchronize the common subtree of FT and TI, if that makes things easier.
--
Boyd Stephen Smith Jr. ,= ,-_-. =.
bss03@volumehost•net ((_/)o o(\_))
ICQ: 514984 YM/AIM: DaTwinkDaddy `-'(. .)`-'
http://iguanasuicide.org/ \_/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
next prev parent reply other threads:[~2008-11-28 23:21 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-17 22:45 Grafting mis-aligned trees Boyd Stephen Smith Jr.
2008-11-18 9:24 ` Michael J Gruber
2008-11-28 23:01 ` Boyd Stephen Smith Jr. [this message]
2008-12-02 16:20 ` Michael J Gruber
2008-12-02 17:19 ` Boyd Stephen Smith Jr.
2008-12-02 17:38 ` Michael J Gruber
2008-12-02 18:28 ` Boyd Stephen Smith Jr.
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=200811281701.46778.bss03@volumehost.net \
--to=bss03@volumehost$(echo .)net \
--cc=git@drmicha$(echo .)warpmail.net \
--cc=git@vger$(echo .)kernel.org \
/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