Philip Martin writes:
> Philip Martin writes:
>
>> An error in my testsuite change. This passes all the tests with the
>> 3-way output:
>>
>> Index: subversion/libsvn_wc/merge.c
>> ===
>> --- subversion/libsvn_wc/merge.c (revis
Daniel Shahaf wrote on Thu, May 01, 2014 at 22:52:06 +:
> Philip Martin wrote on Thu, May 01, 2014 at 19:04:04 +0100:
> > Philip Martin writes:
> >
> > > svn_diff_conflict_display_modified_latest is similar to the output of
> > > GNU diff3 which is probably why it was chosen. Changing it mig
Philip Martin wrote on Thu, May 01, 2014 at 19:04:04 +0100:
> Philip Martin writes:
>
> > svn_diff_conflict_display_modified_latest is similar to the output of
> > GNU diff3 which is probably why it was chosen. Changing it might cause
> > problems for tools that parse the output, but one option
Philip Martin writes:
> An error in my testsuite change. This passes all the tests with the
> 3-way output:
>
> Index: subversion/libsvn_wc/merge.c
> ===
> --- subversion/libsvn_wc/merge.c (revision 1591407)
> +++ subversion/li
Philip Martin writes:
> svn_diff_conflict_display_modified_latest is similar to the output of
> GNU diff3 which is probably why it was chosen. Changing it might cause
> problems for tools that parse the output, but one option for anyone
> affected would be to use GNU diff3 with --diff3-cmd.
We
Philip Martin writes:
> Philip Martin writes:
>
>> Daniel Shahaf writes:
>>
>>> --- subversion/libsvn_wc/merge.c2011-08-06 19:15:44.0 +0400
>>> +++ subversion/libsvn_wc/merge.c2011-09-07 21:47:19.0 +0400
>>> @@ -413,7 +413,7 @@
>>>
Philip Martin writes:
> Daniel Shahaf writes:
>
>> --- subversion/libsvn_wc/merge.c 2011-08-06 19:15:44.0 +0400
>> +++ subversion/libsvn_wc/merge.c 2011-09-07 21:47:19.0 +0400
>> @@ -413,7 +413,7 @@
>>target_marker,
>>
Julian Foad wrote on Mon, Apr 07, 2014 at 13:53:36 +0100:
> Bert Huijben wrote:
> > Julian Foad wrote:
> >> +1 to the suggestion. The current two-way info is pretty difficult to use
> >> in any
> >> non-trivial case, and the 3-way suggestion is significantly more usable
> >> and not
> >> much mor
Bert Huijben wrote:
> Julian Foad wrote:
>> +1 to the suggestion. The current two-way info is pretty difficult to use in
>> any
>> non-trivial case, and the 3-way suggestion is significantly more usable and
>> not
>> much more difficult to understand. Furthermore it is what I expect to see for
>>
Daniel Shahaf writes:
> --- subversion/libsvn_wc/merge.c 2011-08-06 19:15:44.0 +0400
> +++ subversion/libsvn_wc/merge.c 2011-09-07 21:47:19.0 +0400
> @@ -413,7 +413,7 @@
>target_marker,
>righ
> -Original Message-
> From: Julian Foad [mailto:julianf...@btopenworld.com]
> Sent: maandag 7 april 2014 12:32
> To: Bert Huijben
> Cc: 'Daniel Shahaf'; 'Lev Serebryakov'; dev@subversion.apache.org
> Subject: Re: Three-way merge markers by defau
Bert Huijben wrote:
> Daniel Shahaf wrote:
>> What do people feel about applying this patch (from the FreeBSD port) to
>> trunk?
[...]
>> All it does is change the contents of conflict files in --accept=postpone
>> mode: it causes conflict markers to be rendered not as two sides
>> <<
>>
> -Original Message-
> From: Daniel Shahaf [mailto:d...@daniel.shahaf.name]
> Sent: maandag 7 april 2014 10:35
> To: dev@subversion.apache.org
> Cc: Lev Serebryakov
> Subject: Three-way merge markers by default
>
> What do people feel about applying this patch (from the FreeBSD port) to
13 matches
Mail list logo
