Re: Recent unresolved issues

From: Petr Baudis <pasky@suse.cz>
Date: Apr 14, 2006, 16:02 UTC
Message-ID: <20060414160246.GZ27689@pasky.or.cz>
In-Reply-To: <7v64lcqz9j.fsf@assigned-by-dhcp.cox.net>

Dear diary, on Fri, Apr 14, 2006 at 11:31:36AM CEST, I got a letter where Junio C Hamano <junkio@cox.net> said that...

Show 6 quoted lines

> Here is a list of topics in the recent git traffic that I feel
> inadequately addressed.  I've commented on some of them to give
> people a feel for what my priorities are.  Somebody might want
> to rehash the ones low on my priority list to conclusion with a
> concrete proposal if they cared about them enough.  The list is
> *not* ordered in any way.

Nice summary!

Show 9 quoted lines

> * Message-ID: <tnxmzf9sh7k.fsf@arm.com>
>   git could use diff3 instead of merge which is a wrapper around
>   diff3. (Catalin Marinas)
> 
>   If having "diff3" is a lot more common than having "merge", I
>   do not have problem with this; "merge" being a wrapper to
>   "diff3", people who have been happy with the current code
>   would certainly have "diff3" installed so changing to "diff3"
>   would not break them.

I've decided to bite the bullet and made Cogito use diff3 instead of merge as of now. Let's see if anybody complains...

Show 7 quoted lines

> * Message-ID: <1143856098.3555.48.camel@dv>
>   Per branch property, esp. where to merge from (Pavel Roskin)
> 
>   This involves user-level "world model" design, which is more
>   Porcelainish than Plumbing, and as people know I do not do
>   Porcelain well; interested parties need to come up with what
>   they want and how they want to use it.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
Right now I am having amnesia and deja-vu at the same time.  I think
I have forgotten this before.