From: Martin Langhoff (CatalystIT) <martin@catalyst.net.nz>
Date: Sun, 09 Jul 2006 23:12:36 GMT
Subject: Re: [BUGFIX][RESEND]git-cvsexportcommit can't handle merge commits correctly
Message-ID: <44B18D64.9090409@catalyst.net.nz>
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
-----------------------------------------------------------------------