From: Sven Strickroth <sven.strickroth@tu-clausthal.de>
Date: Sat, 26 Jan 2013 00:58:45 GMT
Subject: Re: [PATCH] mergetools: Enhance tortoisemerge to work with
Message-ID: <51032A45.1030308@tu-clausthal.de>
In-Reply-To: <7v622l5d87.fsf@alter.siamese.dyndns.org>

Am 25.01.2013 19:28 schrieb Junio C Hamano:> Sven Strickroth
<sven.strickroth@tu-clausthal.de> writes:
>
>>  TortoiseGitMerge and filenames with spaces
>
> ??? ECANNOTPARSE.
>
> ... ah, wait.  Is this a broken-off tail of your subject line?

Yes.

>> +		touch "$BACKUP"
>> +		basename="$(basename "$merge_tool_path" .exe)"
>> +		if test "$basename" = "tortoisegitmerge"
>> +		then
>> +			"$merge_tool_path" \
>> +				-base "$BASE" -mine "$LOCAL" \
>> +				-theirs "$REMOTE" -merged "$MERGED"
>> +		else
>> +			"$merge_tool_path" \
>> +				-base:"$BASE" -mine:"$LOCAL" \
>> +				-theirs:"$REMOTE" -merged:"$MERGED"
>
> Hmph.
>
> How was the support for "names with spaces" added in this new code?
> I do not spot what is different between this "else" clause and the
> original body of the merge_cmd (which only supported tortoisemerge).
>
> They seem to be doing exactly the same thing.

Erhm, no. As already stated and also mentioned in the commit log:
TortoiseMerge has cli parameter key-values separated by colons,
TortoiseGitMerge has key-values separated by spaces.

-- 
Best regards,
 Sven Strickroth
 PGP key id F5A9D4C4 @ any key-server