Re: [oll-user] Call for initial feedback

[Janek W. <lem...@gm...>]

2013/3/21 Urs Liska <ul...@op...>

> Maybe I succeeded already (although it was at the cost of some nerves and
> an aching back ;-) )
> Submodules and subtree merge aren't intended for our purpose, but
> http://saintgimp.org/2013/01/22/merging-two-git-repositories-into-one-repository-without-losing-file-history/helped.
>
> It was quite complex because it is difficult to move content around when
> there is more than one branch. And I ran into trouble (probably) because
> the history wasn't really straightforward (I had moved folders several
> times and once factored a complete folder out into another repo (i.e.
> deleted it from Git's perspective).
>
> But I think I have managed to set up a new, merged repository.
>

Congrats!


>  It is here: https://sourceforge.net/p/openlilylib/mergerepos/
> and I have uploaded a tar.gz:
> https://dl.dropbox.com/u/49478835/ollMerged.tar.gz
> It would be nice if you (Janek) could have a glance at that and its
> history, just to see if it looks reasonable to you).
>

I've looked and i don't see anything wrong.  Looks like a clean job!


>  AFAICS it is a working repository, although history isn't all too nice
> (e.g. in such a combined repo I would prefix each commit message with a
> label (like oll, xmp) which I obviously haven't done in the past).
>

You should be able to do this now using git filter-branch (of course this
will change history, but maybe it's worth it).  Some info for example here:
http://mm0hai.net/blog/2011/03/10/rewriting-git-commit-message-history.html

best,
janek
-------------- next part --------------
An HTML attachment was scrubbed...