From: Junio C Hamano <junkio@cox.net>
Date: Mon, 07 Nov 2005 23:54:57 GMT
Subject: Re: [PATCH] merge-recursive: Only print relevant rename messages
Message-ID: <7v64r4qai6.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20051107231944.GA11327@c165.ib.student.liu.se>

Fredrik Kuivinen <freku045@student.liu.se> writes:

> @@ -178,7 +181,7 @@ def mergeFile(oPath, oSha, oMode, aPath,
>              sha = bSha
>      else:
>          if aSha != oSha and bSha != oSha:
> -            merge = True
> +            merge = MERGE_TRIVIAL

The rest looks good to me, but are you sure about this part?  I
have a feeling that the above "and" should be "or", meaning, we
check to see if there is _any_ change, and default to TRIVIAL,
but later we would find that we need a real merge and then
promote it to MERGE_3WAY.