On Wed, 7 Oct 2015 12:32:49 +0200
Magnus Therning <mag...@therning.org> wrote:

> > No I like to do a copy with history from a repository into a
> > directory of another repository
> > 
> > git <copy with history> T8Suite <to> TrionicSuites/T8Suite 
> > 
> > Both T8Suite and TrionicSuites are repros
> I suspect Konstantin was only commenting on the organisation of the
> code in the project, not on how you would merge the three repos into
> a single one while keeping the history intact.
> Recently I decided to move a project away from using submodules.  The
> project had a master repo and half-a-dozen sub-repos.  When merging
> all of these repos into a single large one I used subtrees to make
> sure all history was kept. I can recommend it if you aren't put off
> by having a git repo with multiple roots.
> <https://groups.google.com/d/msg/git-users/EiAGI4Ixy7Y/xy6MS3YQAwAJ>

Did you run `git filter-branch` on all the participating subtrees
before glueing them together?

I'm asking because plain subtree merging not only produces several
roots (that's okay I'd say) but each commit of the histories of those
subtrees misses the information of their *current* prefix (directory).
A good illustration is [1] where a user used `git subtree` (as was
suggested to him) to glue histories of two or three separate subtrees
together and was then confused with traversing the resulting history.

This is something to be aware of.  That's why I was hesitant replying
to the OP: it seems like they are not too familiar with Git yet and
throwing all this `git subtree` and `git filter-branch` black voodoo
at them appears to be a bit anti-human to me :-)

1. https://groups.google.com/d/topic/git-users/HXoX-kpkYkM/discussion

You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to