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, 21:32 UTC
Message-ID
<Pine.LNX.4.64.0510201432260.10477@g5.osdl.org>
In-Reply-To
<loom.20051020T220751-355@post.gmane.org>
On Thu, 20 Oct 2005, Junio C Hamano wrote:
Show 5 quoted lines
> 
> Having said that, all is not lost.  Your message made it sound like the
> new head was completely re-rooted and there is no common commit (which
> almost gave me a heart attack), but I do not think it is that bad.  It is
> more like pulling from two places.
No.

What you _must_ do to fix things up is that _you_ merge your current head with your old head, and then you push out the result.

At that point:
>                -----(A) head merlyn and everybody
>              /          pulled from kernel.org previously
>   --- common ------------------------------------(B) head rebased and pushed
>                                                      out by mistake

You should have a (C) that is the merge of both A and B (or a later commit, if you have other commits merged).

Now you can push out that merge, and everybody will be happy again: they'll see somethign that is a proper superset of whichever HEAD they happened to pull.

Don't make everybody else try to fix up your mistakes for you. It's easy enough for you to just fix it up, and everybody else can just pull.

Of course, anybody who did a pull and then did the merge by hand will always have their own private merge, and they should probably just undo that. But undoing _private_ stuff is ok.

		Linus
Previous: Junio C HamanoNext: Junio Hamano
Message 7 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.