From mboxrd@z Thu Jan 1 00:00:00 1970 From: merlyn@stonehenge.com (Randal L. Schwartz) Subject: Re: git-cvsimport "you may need to merge manually" Date: 16 Mar 2006 20:19:13 -0800 Message-ID: <86bqw51z5q.fsf@blue.stonehenge.com> References: <86veud23v0.fsf@blue.stonehenge.com> <7vu09x7puo.fsf@assigned-by-dhcp.cox.net> <86r75122yj.fsf@blue.stonehenge.com> <7vk6at7o06.fsf@assigned-by-dhcp.cox.net> <86fylh20x6.fsf@blue.stonehenge.com> <7vfylh7lkh.fsf@assigned-by-dhcp.cox.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org X-From: git-owner@vger.kernel.org Fri Mar 17 05:19:28 2006 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1FK6Qt-0001Al-Nk for gcvg-git@gmane.org; Fri, 17 Mar 2006 05:19:24 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751267AbWCQETT (ORCPT ); Thu, 16 Mar 2006 23:19:19 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751285AbWCQETT (ORCPT ); Thu, 16 Mar 2006 23:19:19 -0500 Received: from blue.stonehenge.com ([209.223.236.162]:18346 "EHLO blue.stonehenge.com") by vger.kernel.org with ESMTP id S1751267AbWCQETS (ORCPT ); Thu, 16 Mar 2006 23:19:18 -0500 Received: from localhost (localhost [127.0.0.1]) by blue.stonehenge.com (Postfix) with ESMTP id 16E4D8F71E; Thu, 16 Mar 2006 20:19:14 -0800 (PST) Received: from blue.stonehenge.com ([127.0.0.1]) by localhost (blue.stonehenge.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 18384-01-9; Thu, 16 Mar 2006 20:19:13 -0800 (PST) Received: by blue.stonehenge.com (Postfix, from userid 1001) id 80A898F723; Thu, 16 Mar 2006 20:19:13 -0800 (PST) To: Junio C Hamano x-mayan-date: Long count = 12.19.13.2.8; tzolkin = 2 Lamat; haab = 6 Cumku In-Reply-To: <7vfylh7lkh.fsf@assigned-by-dhcp.cox.net> User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3 Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: >>>>> "Junio" == Junio C Hamano writes: Junio> I think the behaviour we are seeing does not make much sense. Junio> I'll take a deeper look at it tonight (or tomorrow if I am Junio> unlucky), if nobody beats me to it. Junio> Sorry about the breakage. No, *thanks* for looking at it. Your tireless contributions are well appreciated. -- Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095 Perl/Unix/security consulting, Technical writing, Comedy, etc. etc. See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!