Re: cg-update (cogito-0.13) bug: changed heads
"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 situation, is which branch you were on when you ran cg-update. I cannot speak for Pasky and I do not use Cogito, but the 'git fetch' and 'git pull' commands that come with core GIT used to have a funny interaction of fetch attempting to update the branch head ref if your working tree happened to be on that branch, which was fixed some time ago. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: cg-update (cogito-0.13) bug: changed heads
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 different enough, or I did something else wrong. -hpa - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: cg-update (cogito-0.13) bug: changed heads
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 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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: cg-update (cogito-0.13) bug: changed heads
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 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? -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ If you want the holes in your knowledge showing up try teaching someone. -- Alan Cox - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
