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 21, 2005, 00:19 UTC
Message-ID
<Pine.LNX.4.64.0510201717100.10477@g5.osdl.org>
In-Reply-To
<Pine.LNX.4.63.0510210157070.14563@wbgn013.biozentrum.uni-wuerzburg.de>
On Fri, 21 Oct 2005, Johannes Schindelin wrote:
Show 5 quoted lines
> > 
> > Oh, they'll need to revert if they want to match Junios history. Otherwise 
> > they'll always generate yet another merge when they pull.
> 
> So?
History matters. History matters as much as the data does.
> It does not have to be a fast-forward. After all, what is another merge? 
> Since that merge does not have Junio as committer, close inspection of 
> the commit will reveal that.

It _does_ have to be a fast-forward, if you expect the tree to have the same content as Junio's.

Even if it merges everything automatically, if the history is different, it could in theory at least merge _differently_ than what Junio had. Plus you'll have a really ugly version history for no good reason.

But yes, it will _work_. It just won't work the way people expect it to, so they'll make bug-reports about not being able to merge automatically, and others will say that they can't re-create it and blame the wrong person.

		Linus
Previous: Johannes SchindelinNext: Petr Baudis
Message 12 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.