git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: rsync update appears broken now

From
Randal L. Schwartz <merlyn@stonehenge.com>
Date
Oct 20, 2005, 14:12 UTC
Message-ID
<86ek6g9t0a.fsf@blue.stonehenge.com>
In-Reply-To
<81b0412b0510200608l61c00ed0yd4dbc00c313665fe@mail.gmail.com>
>>>>> "Alex" == Alex Riesen <raa.lkml@gmail.com> writes:

Alex> Absolutely normal pull into a changed repository. Just fix the Alex> conflict (in fetch-pack.c, look for >>>), git-update-index the file Alex> and commit. Doesn't look like a problem at all.

What do you mean "changed repository"? This is my git image, and I'm not working on git. I made no changes.

Thus, something broken?
-- 
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!
Previous: Alex RiesenNext: Alex Riesen
Message 3 of 21 in “rsync update appears broken now”
  1. Randal L. SchwartzOct 20, 2005
  2. Alex RiesenOct 20, 2005
  3. Randal L. SchwartzOct 20, 2005
  4. Alex RiesenOct 20, 2005
  5. Linus TorvaldsOct 20, 2005
  6. Junio C HamanoOct 20, 2005
  7. Linus TorvaldsOct 20, 2005
  8. Junio HamanoOct 20, 2005
  9. Johannes SchindelinOct 20, 2005
  10. Linus TorvaldsOct 20, 2005
  11. Johannes SchindelinOct 21, 2005
  12. Linus TorvaldsOct 21, 2005
  13. Petr BaudisOct 21, 2005
  14. Linus TorvaldsOct 20, 2005
  15. Junio C HamanoOct 21, 2005
  16. Linus TorvaldsOct 21, 2005
  17. Randal L. SchwartzOct 21, 2005
  18. Linus TorvaldsOct 21, 2005
  19. Morten WelinderOct 20, 2005
  20. dave morganOct 20, 2005
  21. Stephen C. TweedieOct 20, 2005

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.