From: dave morgan <morgad@eclipse.co.uk>
Date: Thu, 20 Oct 2005 18:03:51 GMT
Subject: Re: rsync update appears broken now
Message-ID: <aomfl115b28jajpuspik2es90qhlr9dtdg@4ax.com>
In-Reply-To: <118833cc0510200715x2a17dcbfs53c824435b7381e3@mail.gmail.com>

On Thu, 20 Oct 2005 10:15:58 -0400, Morten Welinder
<mwelinder@gmail.com> wrote:

>I see the very same with an http pull.
>
>Morten
>-
>To unsubscribe from this list: send the line "unsubscribe git" in
>the body of a message to majordomo@vger.kernel.org
>More majordomo info at  http://vger.kernel.org/majordomo-info.html

I got the same with a git:// update

origin  git://git.kernel.org/pub/scm/git/git.git	

david@tower2:~/git$ cg-update
Up to date.

Applying changes...
Merging f8765797a41a39f4dfc7030098c38283e6461a83 ->
6e1c6c103c522d01829f3a63992a023ff031e851
        to ea5a65a59916503d2a14369c46b1023384d51645...
... Auto-merging fetch-pack.c
merge: warning: conflicts during merge

        Conflicts during merge. Do cg-commit after resolving them.

here is status after pull
david@tower2:~/git$ cg-status
Heads:
   >master      ea5a65a59916503d2a14369c46b1023384d51645
  R origin      6e1c6c103c522d01829f3a63992a023ff031e851

? git-build-rev-cache
? git-checkout-cache
? git-convert-cache
? git-diff-cache
? git-diff-helper
? git-export
? git-fsck-cache
? git-http-pull
? git-local-pull
? git-merge-cache
? git-rev-tree
? git-show-rev-cache
? git-update-cache

Dave