From mboxrd@z Thu Jan 1 00:00:00 1970 From: "H. Peter Anvin" Subject: Re: cg-update (cogito-0.13) bug: changed heads Date: Tue, 06 Sep 2005 16:23:43 -0700 Message-ID: <431E24FF.2000700@zytor.com> References: <431E03A5.6060709@zytor.com> <20050906231756.GC26934@pasky.ji.cz> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Git Mailing List X-From: git-owner@vger.kernel.org Wed Sep 07 01:25:17 2005 Return-path: Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1ECmnG-0001aK-80 for gcvg-git@gmane.org; Wed, 07 Sep 2005 01:23:58 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751031AbVIFXX4 (ORCPT ); Tue, 6 Sep 2005 19:23:56 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751033AbVIFXX4 (ORCPT ); Tue, 6 Sep 2005 19:23:56 -0400 Received: from paleosilicon.orionmulti.com ([209.128.68.66]:162 "EHLO paleosilicon.orionmulti.com") by vger.kernel.org with ESMTP id S1751029AbVIFXXz (ORCPT ); Tue, 6 Sep 2005 19:23:55 -0400 X-Envelope-From: hpa@zytor.com Received: from [172.27.0.18] (c-67-180-239-42.hsd1.ca.comcast.net [67.180.239.42]) (authenticated bits=0) by paleosilicon.orionmulti.com (8.12.10/8.12.10) with ESMTP id j86NNhJv013085 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 6 Sep 2005 16:23:45 -0700 User-Agent: Mozilla Thunderbird 1.0.6-1.1.fc4 (X11/20050720) X-Accept-Language: en-us, en To: Petr Baudis In-Reply-To: <20050906231756.GC26934@pasky.ji.cz> X-Spam-Status: No, hits=0.0 required=5.0 tests=AWL autolearn=ham version=2.63 X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on paleosilicon.orionmulti.com X-Virus-Scanned: ClamAV version 0.86.2, clamav-milter version 0.86 on paleosilicon.orionmulti.com X-Virus-Status: Clean Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Petr Baudis wrote: > Dear diary, on Tue, Sep 06, 2005 at 11:01:25PM CEST, I got a letter > where "H. Peter Anvin" told me that... > >>I just found a bug in cogito-0.13, at least to the best of my >>understanding of the situation. >> >>Simplified, the problem looks like this: two sides, A and B, pull from >>repository C. The head of this pull we call 0. >> >>Now commit 1 is added to A. B pulls commit 1 from A, not though C. >>Later, A pushes commit 1 to C. >> >>Next time B tries to pull from C, cg-update will not advance >>refs/heads/origin, even though C now has a new head. Thus, B will think >>that C is in a different state than it actually is. > > > So, C surely has its head updated? Does cg-update "fail" silently, or > does it utter anything? > C has its head updated, yes. cg-update says "Branches already fully merged." -hpa