Re: rsync update appears broken now

From: Linus Torvalds <torvalds@osdl.org>
Date: 2005-10-21 07:32:44
On Thu, 20 Oct 2005, Junio C Hamano wrote:
> 
> 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
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Received on Fri Oct 21 07:33:29 2005

This archive was generated by hypermail 2.1.8 : 2005-10-21 07:33:33 EST