Re: rsync update appears broken now

From

Randal L. Schwartz <merlyn@stonehenge.com>

Date

Oct 21, 2005, 13:49 UTC

Message-ID

<861x2fdloj.fsf@blue.stonehenge.com>

In-Reply-To

<Pine.LNX.4.64.0510201752050.10477@g5.osdl.org>

>>>>> "Linus" == Linus Torvalds <torvalds@osdl.org> writes:

Linus> On Fri, 21 Oct 2005, Junio C Hamano wrote:

>> 
>> I am reasonably sure that the screw-up was only rewinding one commit too much.
>> I've done the merge so things should look better once mirrors catch up.

Linus> Yup, works at least for me. Thx,

Doesn't yet work for me.  What do I need to do now?

    * committish: 4ae22d96fe9248dac4f26b1fc91154ba5e879799
      branch 'master' of rsync://rsync.kernel.org/pub/scm/git/git
    * refs/heads/origin: same as branch 'master' of rsync://rsync.kernel.org/pub/scm/git/git
    Updating from ea5a65a59916503d2a14369c46b1023384d51645 to 4ae22d96fe9248dac4f26b1fc91154ba5e879799.
    fetch-pack.c: needs update
    fatal: Entry 'daemon.c' would be overwritten by merge. Cannot merge.

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.
See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!