Re: cg-update (cogito-0.13) bug: changed heads

2005-09-06 Thread Junio C Hamano
"H. Peter Anvin" <[EMAIL PROTECTED]> writes: > H. Peter Anvin wrote: >>> > OK, now later in the day I could not reproduce this on another box. > Either the situation was different enough, or I did something else wrong. One thing that comes to mind, which may or may not be relevant to your situat

Re: cg-update (cogito-0.13) bug: changed heads

2005-09-06 Thread H. Peter Anvin
H. Peter Anvin wrote: 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." OK, now later in the day I could not reproduce this on another box. Either the situation was d

Re: cg-update (cogito-0.13) bug: changed heads

2005-09-06 Thread H. Peter Anvin
Petr Baudis wrote: Dear diary, on Tue, Sep 06, 2005 at 11:01:25PM CEST, I got a letter where "H. Peter Anvin" <[EMAIL PROTECTED]> 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

Re: cg-update (cogito-0.13) bug: changed heads

2005-09-06 Thread Petr Baudis
Dear diary, on Tue, Sep 06, 2005 at 11:01:25PM CEST, I got a letter where "H. Peter Anvin" <[EMAIL PROTECTED]> 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 fr