From: "Martin Langhoff (CatalystIT)" <martin@catalyst.net.nz>
To: Peter Baumann <siprbaum@stud.informatik.uni-erlangen.de>
Cc: git@vger.kernel.org, Junio C Hamano <junkio@cox.net>
Subject: Re: [BUGFIX][RESEND]git-cvsexportcommit can't handle merge commits correctly
Date: Mon, 10 Jul 2006 11:12:36 +1200 [thread overview]
Message-ID: <44B18D64.9090409@catalyst.net.nz> (raw)
In-Reply-To: <20060707105541.GA17004@xp.machine.xx>
Peter Baumann wrote:
> git-cvsexportcommit should check if the parent (supplied on the cmdline) to use
> for a merge commit is one of the real parents of the merge.
>
> But it errors out if the _first_ parent doesn't match and never checks
> the other parents.
>
Ack. Thanks for spotting this!
m
--
-----------------------------------------------------------------------
Martin @ Catalyst .Net .NZ Ltd, PO Box 11-053, Manners St, Wellington
WEB: http://catalyst.net.nz/ PHYS: Level 2, 150-154 Willis St
OFFICE: +64(4)916-7224 MOB: +64(21)364-017
Make things as simple as possible, but no simpler - Einstein
-----------------------------------------------------------------------
prev parent reply other threads:[~2006-07-09 23:12 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-07-07 10:55 [BUGFIX][RESEND]git-cvsexportcommit can't handle merge commits correctly Peter Baumann
2006-07-09 23:12 ` Martin Langhoff (CatalystIT) [this message]
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=44B18D64.9090409@catalyst.net.nz \
--to=martin@catalyst.net.nz \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=siprbaum@stud.informatik.uni-erlangen.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.