git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: cvsexportcommit dies when applying an (empty) merge commit

From
NWNick Woolley <nickwoolley@yahoo.co.uk>
Date
Nov 25, 2009, 23:00 UTC
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
Previous: Michael J GruberNext: Robin Rosenberg
Message 3 of 4 in “cvsexportcommit dies when applying an (empty) merge commit”
  1. Nick WoolleyNov 25, 2009
  2. Michael J GruberNov 25, 2009
  3. Nick WoolleyNov 25, 2009
  4. Robin RosenbergNov 26, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.