Re: Grafting mis-aligned trees.

[Michael J Gruber <git@drmicha.warpmail.net>]

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? Has FT advanced since you took the initial subdir
snapshot for TI?

Michael