Re: [PATCH 2/2] Change xdl_merge to generate output even for null merges

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: May 25, 2009, 07:51 UTC
Message-ID: <alpine.DEB.1.00.0905250948420.26154@pacific.mpi-cbg.de>
In-Reply-To: <1243210874-18451-3-git-send-email-charles@hashpling.org>

Hi,

On Mon, 25 May 2009, Charles Bailey wrote:

Show 10 quoted lines

> xdl_merge used to have a check to ensure that there was at least
> some change in one or other side being merged but this suppressed
> output for the degenerate case when base, local and remote
> contents were all identical.
> 
> Removing this check enables correct output in the degenerate case
> and xdl_free_script handles freeing NULL scripts so there is no
> need to have the check for these calls.
> 
> Signed-off-by: Charles Bailey <charles@hashpling.org>

Maybe mention here that it just so happens that when there were no changes in base->local, it does not matter what changes (_if any_) were made to base->remote, we should output the remote version.

Took me more than 2 seconds to find that out, so let's spare the occasional reader this time (2 seconds is my attention span).

Your fix is correct.

Ciao, Dscho