Re: strange temporary pull-errors

Hi,

----------------------------------------

From: Thomas Rast <trast <at> student.ethz.ch>
 Subject: Re: strange temporary pull-errors
 Newsgroups: gmane.comp.version-control.git
 Date: 2008-08-23 08:44:45 GMT (2 days, 5 hours and 14 minutes ago)
Oliver Kullmann wrote:

quoted

git pull

[...]

error: Entry 'Buildsystem/Configuration/Html/local_html.mak' not uptodate. Cannot merge.

[...]

quoted

git status

[...]

nothing to commit (working directory clean)

quoted

git pull

[succeeds]

There is nothing special going out, the simple pull should succeed, but
I have to try several times; don't know whether the "git status" is
instrumental here or not --- will try the next time.

Saying 'git status' refreshes the index.  If you have touched (updated
mtime) local_html.mak without making any changes, 'git merge' just
compared the mtime and considered the file changed.  But 'git status'
actually compares the contents and finds it has not been changed.  I
don't know whether 1.6 (most likely builtin-merge) changed behaviour
in this respect, maybe you could try with an older version too.

There are other cases where you need a refresh, for example if you
have made a copy of a git-tracked directory with 'cp -r'.

------------------------------------------

More precisely:

1) First, repository B pulls from A.
2) Then I change B.
3) Then repository A wants to pull from B.
There the error occurs --- the files changed
in B are claimed not to be up-to-date in A!
Obviously!

This looks like a clear git-bug to me: And with 1.5.6.5
this doesn't happen (the second pull just goes through).

It must be something different than you are describing,
since at step 3 repository A is still unchanged, and the error
(like with local_html.mak above) occurs with a file which just
should be updated. Though, after executing "git status",
the pull becomes enabled, so I must have something to do
with the index.

Oliver

P.S. I wonder how one is supposed to reply to an e-mail one (only)
finds in http://article.gmane.org/gmane.comp.version-control.git/ ?
Above I just copy-and-pasted it from the web-page, but this is rather
tedious?

On Mon, Aug 25, 2008 at 07:38:10PM +0100, Oliver Kullmann [off-list ref] wrote:

P.S. I wonder how one is supposed to reply to an e-mail one (only)
finds in http://article.gmane.org/gmane.comp.version-control.git/ ?
Above I just copy-and-pasted it from the web-page, but this is rather
tedious?

Find the given article, like:

http://article.gmane.org/gmane.comp.version-control.git/93647

then append /raw to the url and you can download the raw message. Import
it to your mailer (if you just save it to a file, then mutt can open it,
I think), and just hit reply.