Re: [Axiom-developer] GIT

[Ralf Hemmecke]

First, I think we can agree that axiom--silver--1 is the master copy.
(I haven't yet looked at it but it probably contains all the history 
since Tim started.)

So in fact the history in the sourceforge or google mirror of silver are 
not too important.

But anyway, if they the log data should be kept then it's a bit more 
complicated.

I think we started at SF with --patch-49. From that build-improvements 
branched away. So why not do the following?

1) backup of the whole SF repository (so that the current status could 
be reset)
2) Remove *everything* on SF
3) Create a new trunk from axiom--silver--1--patch-49
4) Re-apply every change to SF that had been done in the past up to the 
time when build-improvements branched away.
5) Re-apply every patch to the build-improvements branch
6) Apply patches from axiom--silver--1 to bring SF/trunk up-to-date.
(Does anybody care for anything else then trunk and 
branches/build-improvements at SF?)

In this way no history would be lost. Just that there might be some 
conflicts since some patches have been applied to SF/trunk since its 
creation which are also applied to axiom--silver--1.

It seems not so straightforward if the history must be kept.

Ralf