From: Andreas Schwab Date: Sun, 25 Jun 2017 08:13:32 GMT Subject: Re: Migration from CVS to Git looses merges Message-ID: <87a84web83.fsf@linux-m68k.org> In-Reply-To: On Jun 25 2017, Urs Thuermann 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."