Dear diary, on Thu, Apr 14, 2005 at 10:23:26PM CEST, I got a letter where Erik van Konijnenburg <[EMAIL PROTECTED]> told me that... > On Thu, Apr 14, 2005 at 09:35:07PM +0200, Petr Baudis wrote: > > Hmm. I actually don't like this naming. I think it's not too consistent, > > is irregular, therefore parsing it would be ugly. What I propose: > > > > 12c\tname <- legend > > <- original file > > D <- tree #1 removed file > > D <- tree #2 removed file > > DD <- both trees removed file > > M <- tree #1 modified file > > M > > DM* <- conflict, tree #1 removed file, tree #2 modified file > > MD* > > MM <- exact same modification > > MM* <- different modifications, merging > > > > This is generic, theoretically scales well even to more trees, is easy > > to parse trivially, still is human readable (actually the asterisk in > > the 'conflict' column is there basically only for the humans), is > > completely regular and consistent. > > Detail: perhaps use underscore instead of space, to avoid space/tab typos > that are invisible on paper and user friendly mail clients?
I'd go for dots in that case. Looks less intrusive. :^) -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html