Skip to main content
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [cross-project-issues-dev] How to merge (subsets of) 2 git repos into 1, preserving history ? 
You might have some luck with subtree merging:
http://git-scm.com/book/en/v1/Git-Tools-Subtree-Merging

But every time I've had to use that, it had me pulling my hair for days
on end...

Doing a subtree merge without squashing should give you a merge commit
with the two separate histories as its ancestors.

I don't remember exactly, but I think showing historic state of a
specific file across the merge commit afterwards is a bit messy (due to
the changed file path)...

On 09.04.2015 11:14, Oberhuber, Martin wrote:
> Hi all,
> 
> Sorry for the wide distribution, but I'm sure somebody has done this before and any pointer would be very helpful.
> The TCF/Terminals restructuring which I mentioned earlier has passed its review so we want to proceed now:
> 
> 
> 1.       Create a new git repo under /gitroot/tm/org.eclipse.tm.terminal.git
> 
> 2.       Fill it with the following subtrees from 2 other git repos, including all history in those subtrees respectively:
> 
> a.       http://git.eclipse.org/c/tm/org.eclipse.tm.git/tree/terminal
> 
> b.      http://git.eclipse.org/c/tcf/org.eclipse.tcf.git/tree/terminals
> 
> I have already reached out to webmaster who could provide the new git repo, but now we're wondering how to merge/import the 2 git histories.
> 
> Please put any hints/advice on the restructuring bug:
> https://bugs.eclipse.org/bugs/show_bug.cgi?id=462230
> 
> Many thanks in advance !
> Martin
> --
> Martin Oberhuber, SMTS / Product Owner - Development Tools, Wind River
> direct +43.662.457915.85  fax +43.662.457915.6
> 
> 
> 
> 
> _______________________________________________
> cross-project-issues-dev mailing list
> cross-project-issues-dev@xxxxxxxxxxx
> To change your delivery options, retrieve your password, or unsubscribe from this list, visit
> https://dev.eclipse.org/mailman/listinfo/cross-project-issues-dev
> 

-- 
Yatta Solutions GmbH
- Carsten Reckord -

  t  +49 69 2475666-33
  f  +49 69 2475668-0
  e  reckord@xxxxxxxx

Office Kassel
  Universitätsplatz 12
  34127 Kassel

Office Frankfurt a.M.
  Mainzer Landstraße 50
  60325 Frankfurt a.M.

Seat, Trade Register:
  Registered seat: Kassel
  Amtsgericht Kassel, HRB 14720
  VAT-ID DE263191529

Management:
  Johannes Jacop
  Dr. Christian Schneider

Contact:
  t  +49 (0)69 2475666-0
  f  +49 (0)69 2475668-0
  e  info@xxxxxxxx

Back to the top