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

Re: Migration from CVS to Git looses merges

From
Andreas Schwab <schwab@linux-m68k.org>
Date
Jun 25, 2017, 08:13 UTC
Message-ID
<87a84web83.fsf@linux-m68k.org>
In-Reply-To
<ygfd19stua3.fsf@tehran.isnogud.escape.de>
On Jun 25 2017, Urs Thuermann <urs@isnogud.escape.de> wrote:
> In both cases, the branch "a-branch" is in the git repository but is
> not merged with the master branch, i.e. rev 1.4 has only parent 1.3
> but not 1.2.2.2.  I also tried cvsimport with several regexes passed
> using -M to match "Merge branch a-branch", but still the same result.

Merges are recognized purely by matching the commit message, and the regexp must capture the branch name in the first subexpr. The -m option enables some default regexps but won't match your example. You can use -M 'Merge branch ([-\w]+)' to match it.

Andreas.
-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."
Previous: Urs ThuermannNext: Urs Thuermann
Message 2 of 3 in “Migration from CVS to Git looses merges”
  1. Urs ThuermannJun 25, 2017
  2. Andreas SchwabJun 25, 2017
  3. Urs ThuermannJun 25, 2017

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.