From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andreas Schwab Subject: Re: git-cvsimport with cvsps output in commit msg breaks imports Date: Fri, 10 Dec 2010 20:58:27 +0100 Message-ID: References: <20101209220347.GA3180@shuttle.home> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org, cvsps@dm.cobite.com, smurf@smurf.noris.de To: Thomas Adam X-From: git-owner@vger.kernel.org Fri Dec 10 20:58:38 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PR96y-0001wF-W4 for gcvg-git-2@lo.gmane.org; Fri, 10 Dec 2010 20:58:37 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754814Ab0LJT6b (ORCPT ); Fri, 10 Dec 2010 14:58:31 -0500 Received: from mail-out.m-online.net ([212.18.0.10]:36196 "EHLO mail-out.m-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752114Ab0LJT6a (ORCPT ); Fri, 10 Dec 2010 14:58:30 -0500 Received: from frontend1.mail.m-online.net (frontend1.mail.intern.m-online.net [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id B0842188B5A0; Fri, 10 Dec 2010 20:58:28 +0100 (CET) Received: from igel.home (ppp-88-217-110-181.dynamic.mnet-online.de [88.217.110.181]) by mail.mnet-online.de (Postfix) with ESMTP id 676C11C0024E; Fri, 10 Dec 2010 20:58:28 +0100 (CET) Received: by igel.home (Postfix, from userid 501) id 25A90CA2A0; Fri, 10 Dec 2010 20:58:28 +0100 (CET) X-Yow: There's a little picture of ED MCMAHON doing BAD THINGS to JOAN RIVERS in a $200,000 MALIBU BEACH HOUSE!! In-Reply-To: <20101209220347.GA3180@shuttle.home> (Thomas Adam's message of "Thu, 9 Dec 2010 22:03:49 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2.90 (gnu/linux) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Thomas Adam writes: > More specifically, the commit which I think introduced the problem, and all > subsequent commits thereafter is here: > > https://github.com/ThomasAdam/tmux/commit/f0220a10b01a764e0dc52ea1b2407f58600a30eb > > Note that from this commit onwards, the commit *message* has a bunch of > cvsps output in it. I can only surmise that this somehow causes problems > for cvsimport. The cvsps output is ambigous. If the commit log includes text that resembles the patchset format generated by cvsps then git-cvsimport can easily get confused. 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."