Re: git pull on ia64 linux tree

From: Petr Baudis <pasky@ucw.cz>
Date: Apr 28, 2005, 00:33 UTC
Message-ID: <20050428003342.GW22956@pasky.ji.cz>
In-Reply-To: <Pine.LNX.4.58.0504271719380.18901@ppc970.osdl.org>

Dear diary, on Thu, Apr 28, 2005 at 02:21:19AM CEST, I got a letter where Linus Torvalds <torvalds@osdl.org> told me that...

Show 12 quoted lines

> 
> 
> On Thu, 28 Apr 2005, Petr Baudis wrote:
> > 
> > Hmm, doesn't the three-way read-tree -m take care of that? Then it
> > should hit
> 
> Yes, you're right, I didn't think about the fact that the helper script 
> actually does the checkout for the clashing files it merges.
> 
> (Which is not really nice, because it means that some files get updated 
> and others don't, depending on how they were merged, but whatever..)

We always do checkout-cache -f -a after we do merge-cache, so it should end up in a consistent state.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor