Re: Git: Having trouble merging two repositories by interweaving their histories

2013-09-09 Thread THILLOSEN Andreas
Le 09/10/13 01:06, Andreas Schwab a écrit : > THILLOSEN Andreas writes: > >> It implies "interweaving" their histories, so that I can get a "state" >> of both RepA and RepB around a same time period of time. > > This is only possible by rewriting every commit to point to a new tree > containing

Re: Git: Having trouble merging two repositories by interweaving their histories

2013-09-09 Thread Andreas Schwab
THILLOSEN Andreas writes: > It implies "interweaving" their histories, so that I can get a "state" > of both RepA and RepB around a same time period of time. This is only possible by rewriting every commit to point to a new tree containing the combined trees of the two repositories. To get a me

Git: Having trouble merging two repositories by interweaving their histories

2013-09-09 Thread THILLOSEN Andreas
Hi, I recently stumbled over problems, while trying to merge two repositories (RepA and RepB) into a single one (RepM). I must mention that indexed files in RepA are totally distinct from indexed files in RepB, thus no conflict shall appear. The problem is that I never manage to get the exact resu