From: Nick Woolley <nickwoolley@yahoo.co.uk>
Date: Wed, 25 Nov 2009 23:00:27 GMT
Subject: Re: cvsexportcommit dies when applying an (empty) merge commit
Message-ID: <4B0DB70B.1090405@yahoo.co.uk>
In-Reply-To: <4B0D2BC5.1000002@drmicha.warpmail.net>

Michael J Gruber wrote:
> I think the behavior is correct in the sense that you're telling git
> cvsexportcommit to make a commit to cvs, and it can't, because there is
> no change to commit. A merge can't be represented.

The main problem with this is that by default it aborts the whole process with
an error.  I'd prefer a non-fatal warning rather than having to catch the error
and decide if it's ignorable or not, although for now I guess I'll have to, or
make a fork of git-cvsexportcommit.

CVS doesn't has an --allow-empty equivalent I know of, and nor does
git-cvsexportcommit.

Cheers,

N