Re: Towards CVS code-exchange and gateways

From: Petr Baudis <pasky@suse.cz>
Date: Oct 26, 2005, 20:51 UTC
Message-ID: <20051026205130.GA20563@pasky.or.cz>
In-Reply-To: <46a038f90510260211i47c8a4e1oca8be8d0833f4b68@mail.gmail.com>

Dear diary, on Wed, Oct 26, 2005 at 11:11:49AM CEST, I got a letter where Martin Langhoff <martin.langhoff@gmail.com> told me that...

> 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).

Aha, so you are not aiming for proper two-way incremental i/e, and one will have to cherrypick to import after an export... well, I guess that can be good enough for many cases. But to use Linus' words, the really interesting problem is to have the proper revision tree in the CVS heads as well, so that you could do normal merges. And it shouldn't be _that_ hard either...

Show 6 quoted lines

> > 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 ;-)

I *think* someone actually really did something like that. ;-)

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
VI has two modes: the one in which it beeps and the one in which
it doesn't.