Re: [Axiom-developer] GIT

[Gabriel Dos Reis]

"Bill Page" <address@hidden> writes:

[...]

| So far as I know, no one has been updating SourceForge SVN /trunk
| aka. "silver" lately. It was originally created by converting the
| CVS version of patch-49 at SourceForge to SVN using the SourceForge
| CVS to SVN migration tool. Gaby branched build-improvements from this
| version of /trunk. After the migration of CVS to SVN the problem of
| incorrectly marked binary files in the CVS was discovered and Ralf
| Hemmecke committed some patches to correct the resulting corrupted
| binary files in /trunk. Meanwhile Tim Daly has had serious problems
| trying to commit changes to SourceForge SVN and so none of the
| patch-50 changes are in /trunk (Or are they? I might be confused
| about that.) Also, as far as I know, Tim has not committed any
| new patches since patch-50 to the tla archive, right Tim?

My understanding of the silver branch from its birth is that it is
where we apply "blessed" patches, get tests before they ever go to
gold (which is supposed to be the eternal release branch, most
stable).  [Experiments are conducted on branches.]  However, for
various reasons, Tim never followed that plan.  I've repeatedly requested
that he sent his patches to the list even when he does not intend to
maintain silver (I never conceived of silver as being maintainer by
Tim).  That rarely happened. 

My updated check out of silver has this on the top of ChangeLog:

2006-09-14  Ralf Hemmecke  <address@hidden>

        * src/doc/french/ac20.pdf, src/doc/french/manuel1.pdf,
        src/doc/french/manuel2.pdf, src/doc/bookvol1.pdf,
        src/share/algebra/libaxiom.al, zips/tla-1.1.tar.gz, *.Z:
        Corrected corrupted binary files by taking the corresponding files
        from axiom--main--1--patch-50.
        cd $Gold
        find . -type f ! -regex '.*\.arch-ids.*' ! -regex '.*{arch}.*' \
             ! -regex '.*\.patch' ! -exec cmp {}
        $Silver/trunk/axiom/{} ';' \
             -exec cp {} $Silver/trunk/axiom/{} ';'


I branched from silver (as I encourage everybody to do) to conduct 
experiments related to improving the existing build machinery.
Once I've resolved the most outstanding issues, I'll send a message
proposing merge to trunk (silver).  I'm even more positive about it
than I was a couple of months ago.  At that time, I suspect we will
have even more interesting debates ;-)

| In any case, my point is that the version of /trunk at Google
| should be identical to the version of /trunk at SourceForge

agreed.  I believe anything else is a good recipe for more confusion.