From: Linus Torvalds Date: Thu, 20 Oct 2005 23:49:21 GMT Subject: Re: rsync update appears broken now Message-ID: In-Reply-To: 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