strange temporary pull-errors

strange temporary pull-errors

[Oliver Kullmann]

Hi,

again and again (first I ignored it) I get the
following with version 1.6.0:

> git pull
remote: Counting objects: 55, done.
remote: Compressing objects: 100% (31/31), done.
remote: Total 34 (delta 10), reused 24 (delta 3)
Unpacking objects: 100% (34/34), done.
From /h/21/GemeinsameBasis/SAT-Algorithmen/OKplatform/OKsystem/Transitional/
   d69da9e..d9b9324  master     -> origin/master
Updating 688e3cb..d9b9324
error: Entry 'Buildsystem/Configuration/Html/local_html.mak' not uptodate. Cannot mer
ge.
> git pull
Updating 688e3cb..d9b9324
error: Entry 'Buildsystem/Configuration/Html/local_html.mak' not uptodate. Cannot mer
ge.
> git status
# On branch master
# Your branch is behind 'origin/master' by 3 commits, and can be fast-forwarded.
#
nothing to commit (working directory clean)
> git pull
Updating 688e3cb..d9b9324
Fast forward
 Buildsystem/Configuration/Html/local_html.mak      |    3 +
 .../Configuration/ReleaseProcess/ReleaseHistory    |    1 +
 Buildsystem/Html/Local/History.html                |   11 +++-
 Buildsystem/Html/Local/PackageHistory.html         |   52 ++++++++++++++++++++
 Buildsystem/Html/Local/plans/History.hpp           |    2 +-
 Buildsystem/Html/Local/plans/milestones.hpp        |    4 +-
 Buildsystem/OKlibBuilding/Targets/html/Makefile    |    1 +
 Buildsystem/ReleaseProcess/README                  |    9 +++-
 Buildsystem/ReleaseProcess/plans/general.hpp       |    5 +-
 Buildsystem/ReleaseProcess/plans/milestones.hpp    |    4 +-
 plans/general.hpp                                  |    7 ++-
 11 files changed, 87 insertions(+), 12 deletions(-)
 create mode 100644 Buildsystem/Html/Local/PackageHistory.html


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.

Oliver

Re: strange temporary pull-errors

[Thomas Rast]

[-- Attachment #1: Type: text/plain, Size: 1052 bytes --]

Oliver Kullmann wrote:
> 
> > git pull
[...]
> error: Entry 'Buildsystem/Configuration/Html/local_html.mak' not uptodate. Cannot merge.
[...]
> > git status
[...]
> nothing to commit (working directory clean)
> > 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'.

- Thomas

-- 
Thomas Rast
trast@student.ethz.ch



[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 197 bytes --]

Re: strange temporary pull-errors

[Miklos Vajna]

[-- Attachment #1: Type: text/plain, Size: 1732 bytes --]

On Fri, Aug 22, 2008 at 08:13:24PM +0100, Oliver Kullmann <O.Kullmann@swansea.ac.uk> wrote:
> > git pull
> Updating 688e3cb..d9b9324
> error: Entry 'Buildsystem/Configuration/Html/local_html.mak' not uptodate. Cannot mer
> ge.
> > git status
> # On branch master
> # Your branch is behind 'origin/master' by 3 commits, and can be fast-forwarded.
> #
> nothing to commit (working directory clean)
> > git pull
> Updating 688e3cb..d9b9324
> Fast forward
>  Buildsystem/Configuration/Html/local_html.mak      |    3 +
>  .../Configuration/ReleaseProcess/ReleaseHistory    |    1 +
>  Buildsystem/Html/Local/History.html                |   11 +++-
>  Buildsystem/Html/Local/PackageHistory.html         |   52 ++++++++++++++++++++
>  Buildsystem/Html/Local/plans/History.hpp           |    2 +-
>  Buildsystem/Html/Local/plans/milestones.hpp        |    4 +-
>  Buildsystem/OKlibBuilding/Targets/html/Makefile    |    1 +
>  Buildsystem/ReleaseProcess/README                  |    9 +++-
>  Buildsystem/ReleaseProcess/plans/general.hpp       |    5 +-
>  Buildsystem/ReleaseProcess/plans/milestones.hpp    |    4 +-
>  plans/general.hpp                                  |    7 ++-
>  11 files changed, 87 insertions(+), 12 deletions(-)
>  create mode 100644 Buildsystem/Html/Local/PackageHistory.html
> 
> 
> 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.

Yes, it is. It runs git update-index --refresh.

I think Junio fixed this two days ago in 9ca8f60 ("git-merge": allow
fast-forwarding in a stat-dirty tree). Could you please confirm?

Thanks.

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: strange temporary pull-errors

[Oliver Kullmann]

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:
> 
> > git pull
[...]
> error: Entry 'Buildsystem/Configuration/Html/local_html.mak' not uptodate. Cannot merge.
[...]
> > git status
[...]
> nothing to commit (working directory clean)
> > 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?

Re: strange temporary pull-errors

[Miklos Vajna]

[-- Attachment #1: Type: text/plain, Size: 585 bytes --]

On Mon, Aug 25, 2008 at 07:38:10PM +0100, Oliver Kullmann <O.Kullmann@swansea.ac.uk> 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.

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]