From: Andreas Schwab <schwab@linux-m68k.org>
To: Urs Thuermann <urs@isnogud.escape.de>
Cc: git@vger.kernel.org
Subject: Re: Migration from CVS to Git looses merges
Date: Sun, 25 Jun 2017 10:13:32 +0200 [thread overview]
Message-ID: <87a84web83.fsf@linux-m68k.org> (raw)
In-Reply-To: <ygfd19stua3.fsf@tehran.isnogud.escape.de> (Urs Thuermann's message of "25 Jun 2017 09:12:52 +0200")
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."
next prev parent reply other threads:[~2017-06-25 8:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-25 7:12 Migration from CVS to Git looses merges Urs Thuermann
2017-06-25 8:13 ` Andreas Schwab [this message]
2017-06-25 9:30 ` Urs Thuermann
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=87a84web83.fsf@linux-m68k.org \
--to=schwab@linux-m68k.org \
--cc=git@vger.kernel.org \
--cc=urs@isnogud.escape.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.