From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Mon, 05 Dec 2005 20:57:37 GMT
Subject: Re: cvsexportcommit/cvsimport workflow
Message-ID: <46a038f90512051257gf185f0cy11894a1114bc6872@mail.gmail.com>
In-Reply-To: <200511212043.57434.lan@ac-sw.com>

On 11/21/05, Alexander Litvinov <lan@ac-sw.com> wrote:
> Can ypu please explain how to use cvsimport with cvsexportcommit scripts ?

Your approach is good -- that's exactly how I use them too. I normally
use git-format-patch to review what patches I have 'pending' to be
pushed upstream. It's great because it knows your last common commit,
and it uses git-cherry to spot commits that are identical on both
sides.

We should perhaps create git-cvsexport, followning git-format-patch's
usage of git-cherry, and calling git-cvsexportcommit with them.
There's been talk about doing it -- I'll probably do it as soon as I
need it for a project. Feel free to have a go at it  ;-)

> 7. Export git commits to cvs: What should be exported question become harder
> and harder. Possible I should use some tag and run:
> git-rev-list MY-TAG..master | xargs -n 1 git-cvsexportcommit -vX -cX (by the
> way, why just -v -c does not work ? I must add something to make options
> work)

Strange. The getopts line should look like:

     getopts('hpvc');

(al least it does on my repo) which means that it doesn't expect
parameter _values_. Have you got the same line in the script? Perhaps
your getopts is broken or strange?

> This cycle is a bit of mess. I can write some scripts but I have no idea how
> this is supposed to work !

Well... you have the right idea... and yes it's a bit of a mess.

> The biggest problem - conflict. I should resove them twice, during merging
> origin branch to master and when exporting these changes to cvs. By the way,
> I still can't export merge commit :-)

That's exactly the issue. It's somewhat manual -- because you can't
really automate it 100%. CVS won't know what to do with a merge, so
every time you develop in paralell under git and then merge, you'll
have to fudge things somehow to trick cvs. There's an impedance
mismatch there.

cheers,


martin