From: "H. Peter Anvin" <hpa@zytor.com>
To: Petr Baudis <pasky@suse.cz>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: cg-update (cogito-0.13) bug: changed heads
Date: Tue, 06 Sep 2005 16:23:43 -0700 [thread overview]
Message-ID: <431E24FF.2000700@zytor.com> (raw)
In-Reply-To: <20050906231756.GC26934@pasky.ji.cz>
Petr Baudis wrote:
> Dear diary, on Tue, Sep 06, 2005 at 11:01:25PM CEST, I got a letter
> where "H. Peter Anvin" <hpa@zytor.com> 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
next prev parent reply other threads:[~2005-09-06 23:23 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-09-06 21:01 cg-update (cogito-0.13) bug: changed heads H. Peter Anvin
2005-09-06 23:17 ` Petr Baudis
2005-09-06 23:23 ` H. Peter Anvin [this message]
2005-09-07 1:36 ` H. Peter Anvin
2005-09-07 2:17 ` Junio C Hamano
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=431E24FF.2000700@zytor.com \
--to=hpa@zytor.com \
--cc=git@vger.kernel.org \
--cc=pasky@suse.cz \
/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.