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

Re: rsync update appears broken now

From
Linus Torvalds <torvalds@osdl.org>
Date
Oct 20, 2005, 23:49 UTC
Message-ID
<Pine.LNX.4.64.0510201647490.10477@g5.osdl.org>
In-Reply-To
<Pine.LNX.4.63.0510210140400.12723@wbgn013.biozentrum.uni-wuerzburg.de>
On Fri, 21 Oct 2005, Johannes Schindelin wrote:
> 
> Also, people having merged with (A) would not have to undo that merge as 
> was suggested. The new (C) commit would contain the revert of (A).

Oh, they'll need to revert if they want to match Junios history. Otherwise they'll always generate yet another merge when they pull.

Doesn't matter that the _tree_ state may be the same, the only thing that matters is that their history will be different, and thus they will never be able to fast-forwared to Junio's tree unless they revert their local merge.

		Linus
Previous: Johannes SchindelinNext: Johannes Schindelin
Message 10 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.