From mboxrd@z Thu Jan  1 00:00:00 1970
From: Junio C Hamano <junkio@cox.net>
Subject: Re: [PATCH] Avoid excessive rewrites in merge-recursive
Date: Wed, 25 Apr 2007 14:18:21 -0700
Message-ID: <7vodlcup9e.fsf@assigned-by-dhcp.cox.net>
References: <20070425200659.GA30061@steel.home>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: git@vger.kernel.org
To: Alex Riesen <raa.lkml@gmail.com>
X-From: git-owner@vger.kernel.org Wed Apr 25 23:18:26 2007
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git@gmane.org
Received: from vger.kernel.org ([209.132.176.167])
	by lo.gmane.org with esmtp (Exim 4.50)
	id 1Hgosb-0000Mb-DE
	for gcvg-git@gmane.org; Wed, 25 Apr 2007 23:18:25 +0200
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754223AbXDYVSW (ORCPT <rfc822;gcvg-git@m.gmane.org>);
	Wed, 25 Apr 2007 17:18:22 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754238AbXDYVSW
	(ORCPT <rfc822;git-outgoing>); Wed, 25 Apr 2007 17:18:22 -0400
Received: from fed1rmmtao102.cox.net ([68.230.241.44]:47202 "EHLO
	fed1rmmtao102.cox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1754223AbXDYVSW (ORCPT <rfc822;git@vger.kernel.org>);
	Wed, 25 Apr 2007 17:18:22 -0400
Received: from fed1rmimpo01.cox.net ([70.169.32.71])
          by fed1rmmtao102.cox.net
          (InterMail vM.7.05.02.00 201-2174-114-20060621) with ESMTP
          id <20070425211822.FJXK1268.fed1rmmtao102.cox.net@fed1rmimpo01.cox.net>;
          Wed, 25 Apr 2007 17:18:22 -0400
Received: from assigned-by-dhcp.cox.net ([68.5.247.80])
	by fed1rmimpo01.cox.net with bizsmtp
	id rZJL1W00Y1kojtg0000000; Wed, 25 Apr 2007 17:18:21 -0400
In-Reply-To: <20070425200659.GA30061@steel.home> (Alex Riesen's message of
	"Wed, 25 Apr 2007 22:06:59 +0200")
User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux)
Sender: git-owner@vger.kernel.org
Precedence: bulk
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/45582>

Alex Riesen <raa.lkml@gmail.com> writes:

> Just as you may have thought merge-recursive cannot get any uglier
> someone comes and does just this: puts another level of indentation.

It really was painful for me the last time I touched the file,
so I share that feeling.  The complexity of this program is
getting out of hand.

Probably we would want a refactoring before doing something like
this.