From: Nick Woolley <nickwoolley@yahoo.co.uk>
To: Michael J Gruber <git@drmicha.warpmail.net>
Cc: git@vger.kernel.org
Subject: Re: cvsexportcommit dies when applying an (empty) merge commit
Date: Wed, 25 Nov 2009 23:00:27 +0000 [thread overview]
Message-ID: <4B0DB70B.1090405@yahoo.co.uk> (raw)
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
next prev parent reply other threads:[~2009-11-25 23:00 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-25 11:59 cvsexportcommit dies when applying an (empty) merge commit Nick Woolley
2009-11-25 13:06 ` Michael J Gruber
2009-11-25 23:00 ` Nick Woolley [this message]
2009-11-26 6:51 ` Robin Rosenberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4B0DB70B.1090405@yahoo.co.uk \
--to=nickwoolley@yahoo.co.uk \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox