Re: [oll-user] Call for initial feedback

[Urs L. <ul...@op...>]

Am 21.03.2013 12:53, schrieb Janek Warchoł:
> 2013/3/21 Urs Liska <ul...@op... <mailto:ul...@op...>>
>
>     I have just read the submodules chapter in the progit book, and it
>     seems it isn't the best solution.
>     First, a submodule is a repository with a different remote (i.e.
>     pull in another repository to use and manage it within the main
>     repository). So we'd have to keep the other remote repositories
>     anyway (IIUC). Second, the book issues some warnings about having
>     to be careful not to break things when working in submodules.
>
>     For my taste this rather looks like keeping the structure as it is
>     or managing to merge the repositories and maintain them as one.
>
>
> You are probably quite right.  I hope to try merging some repos, maybe 
> on Easter.
>
> best,
> Janek
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.
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).

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).
Now I'll have to bring the directory structure in line again, update 
some readme files and do clean-up stuff like that. But that should be a 
breeze now ...
And finally I'll replace the existing repo so we'll only have one repo.

Best
Urs
-------------- next part --------------
An HTML attachment was scrubbed...