{"thread":{"id":"15199","subject":"Re: strange temporary pull-errors","startedAt":"2008-08-25T18:38:10Z","lastAt":"2008-08-25T19:39:57Z","messageCount":2,"participants":["Oliver Kullmann","Miklos Vajna"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"88485","messageId":"20080825183810.GL7592@cs-wsok.swansea.ac.uk","threadId":"15199","inReplyTo":null,"subject":"Re: strange temporary pull-errors","fromName":"Oliver Kullmann","fromEmail":"o.kullmann@swansea.ac.uk","sentAt":"2008-08-25T18:38:10Z","receivedAt":"2008-08-25T18:38:10Z","isPatch":false,"sender":{"key":"o.kullmann@swansea.ac.uk","avatar":null},"body":"Hi,\n\n----------------------------------------\n\nFrom: Thomas Rast <trast <at> student.ethz.ch>\n Subject: Re: strange temporary pull-errors\n Newsgroups: gmane.comp.version-control.git\n Date: 2008-08-23 08:44:45 GMT (2 days, 5 hours and 14 minutes ago)\nOliver Kullmann wrote:\n> \n> > git pull\n[...]\n> error: Entry 'Buildsystem/Configuration/Html/local_html.mak' not uptodate. Cannot merge.\n[...]\n> > git status\n[...]\n> nothing to commit (working directory clean)\n> > git pull\n[succeeds]\n> There is nothing special going out, the simple pull should succeed, but\n> I have to try several times; don't know whether the \"git status\" is\n> instrumental here or not --- will try the next time.\n\nSaying 'git status' refreshes the index.  If you have touched (updated\nmtime) local_html.mak without making any changes, 'git merge' just\ncompared the mtime and considered the file changed.  But 'git status'\nactually compares the contents and finds it has not been changed.  I\ndon't know whether 1.6 (most likely builtin-merge) changed behaviour\nin this respect, maybe you could try with an older version too.\n\nThere are other cases where you need a refresh, for example if you\nhave made a copy of a git-tracked directory with 'cp -r'.\n\n------------------------------------------\n\nMore precisely:\n\n1) First, repository B pulls from A.\n2) Then I change B.\n3) Then repository A wants to pull from B.\nThere the error occurs --- the files changed\nin B are claimed not to be up-to-date in A!\nObviously!\n\nThis looks like a clear git-bug to me: And with 1.5.6.5\nthis doesn't happen (the second pull just goes through).\n\nIt must be something different than you are describing,\nsince at step 3 repository A is still unchanged, and the error\n(like with local_html.mak above) occurs with a file which just\nshould be updated. Though, after executing \"git status\",\nthe pull becomes enabled, so I must have something to do\nwith the index.\n\nOliver\n\nP.S. I wonder how one is supposed to reply to an e-mail one (only)\nfinds in http://article.gmane.org/gmane.comp.version-control.git/ ?\nAbove I just copy-and-pasted it from the web-page, but this is rather\ntedious?\n"},{"id":"88493","messageId":"20080825193957.GH23800@genesis.frugalware.org","threadId":"15199","inReplyTo":"20080825183810.GL7592@cs-wsok.swansea.ac.uk","subject":"Re: strange temporary pull-errors","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-08-25T19:39:57Z","receivedAt":"2008-08-25T19:39:57Z","isPatch":false,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"On Mon, Aug 25, 2008 at 07:38:10PM +0100, Oliver Kullmann <O.Kullmann@swansea.ac.uk> wrote:\n> P.S. I wonder how one is supposed to reply to an e-mail one (only)\n> finds in http://article.gmane.org/gmane.comp.version-control.git/ ?\n> Above I just copy-and-pasted it from the web-page, but this is rather\n> tedious?\n\nFind the given article, like:\n\nhttp://article.gmane.org/gmane.comp.version-control.git/93647\n\nthen append /raw to the url and you can download the raw message. Import\nit to your mailer (if you just save it to a file, then mutt can open it,\nI think), and just hit reply.\n"}]}