Re: rsync update appears broken now

From: Linus Torvalds <torvalds@osdl.org>
Date: 2005-10-21 09:49:21
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
-
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 09:50:04 2005

This archive was generated by hypermail 2.1.8 : 2005-10-21 09:50:08 EST