Re: Towards CVS code-exchange and gateways

From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Oct 26, 2005, 09:11 UTC
Message-ID: <46a038f90510260211i47c8a4e1oca8be8d0833f4b68@mail.gmail.com>
In-Reply-To: <20051026085302.GF30889@pasky.or.cz>

On 10/26/05, Petr Baudis <pasky@suse.cz> wrote:

Show 14 quoted lines

> Dear diary, on Wed, Oct 26, 2005 at 05:35:41AM CEST, I got a letter
> where Martin Langhoff <martin.langhoff@gmail.com> told me that...
> > Update here: Sven sent me a cool 4 line shell script that has the
> > basics. Next thing I know, and I was dumped into a boring presentation
> > -- so I turned it into a more complete Perl script. Still incomplete &
> > extremely untested, but showing the basics.
> >
> > Give me a couple more boring presentations and we'll be done ;-)
>
> Can I then import from the CVS incrementally later? I guess from the
> cvsimport code that it just tries to always import everything but the
> already imported commits get the same hashes so it magically imports
> "incrementally"... (The code could use some descriptive comments, it is
> rather spaggetish.)

Yes -- the cvsimport script does incremental imports. If you use cvsimport to bring in the commits from CVS, you must treat those branches as "read only". But you can open new heads from them and do your "local" work there.

That's what we do with Moodle, as you can see here: http://locke.catalyst.net.nz/gitweb?p=moodle.git;a=summary the branches in uppercase are imported from CVS by a cronjob. The branches that begin with "mdl" open off those, and we merge the cvs updates often.

The goal for this script that I'm drafting is to be able to push commits back into cvs in a format that maximises the chance of git-cherry identifying them when they are echoed back (and thus avoiding bogus conflicts).

> If someone really desperately needs this, BTW, you might be able to
> merge two Monotone branches (.git and .cvssync) to get two-way
> incremental GIT and CVS interface, and then do that through Monotone.
> ;-))

I'm really scared by the concept ;-)

The script has moved forward quite a bit -- and I suspect it might even work. Current (untested) version attached.

cheers,

martin