Re: merge time

From: Matthew L Foster <mfoster167@yahoo.com>
Date: Jul 30, 2007, 16:20 UTC
Message-ID: <153733.59721.qm@web51006.mail.re2.yahoo.com>
In-Reply-To: <Pine.LNX.4.64.0707292114120.6510@asgard.lang.hm>

--- david@lang.hm wrote:

Show 7 quoted lines

> if you clone your tree and merge from mine, and I clone my tree and merge 
> from yours, the result of both merges _must_ be the same there will be 
> trouble when we both try and merge with tree C later on.
> 
> another thing is that a given commit cannot be changed once it's created 
> (if it was changed it wouldn't have the same sha1 value) so you can't just 
> go around changeing dates on commits that took place elsewhere.

Local commit order is stored locally right? From looking at gitweb on kernel.org it seems all the info is already there, a merge has a list of commits in that merge and they should be displayed in local commit order rather than external creation time order.

-Matt

       
____________________________________________________________________________________Ready for the edge of your seat? 
Check out tonight's top picks on Yahoo! TV. 
http://tv.yahoo.com/