On 06/19/2011 05:19 PM, Johan Corveleyn wrote:
> Anywayzzz ... we'll see when we get there I suppose :-).
heh this thread so far: "This here sucks" -- "I know something better" --
"This is how it works" -- "No, this one doesn't work." -- "Oh shucks, how
about that" -- "I have no idea" -- "Neither
On Thu, Jun 16, 2011 at 11:41 PM, Stefan Sperling wrote:
> On Thu, Jun 16, 2011 at 10:38:12PM +0200, Johan Corveleyn wrote:
>> Are you sure? Maybe there are different definitions of how patience
>> diff works (it seems to be rather undocumented :-)). I'm not really
>> into the details, but from wh
On 06/16/2011 01:24 PM, Branko Čibej wrote:
> On 16.06.2011 12:38, Neels J Hofmeyr wrote:
>> On 06/15/2011 02:44 PM, Branko Čibej wrote:
>>> GNU diff is a general-purpose diff tool. 'svn diff' is not.
>> Then again, we now have 'svn patch' because some platforms "lack" general
>> purpose commandl
On Thu, Jun 16, 2011 at 10:38:12PM +0200, Johan Corveleyn wrote:
> Are you sure? Maybe there are different definitions of how patience
> diff works (it seems to be rather undocumented :-)). I'm not really
> into the details, but from what I've read on this thread on the git
> mailinglist [1], I tho
On Wed, Jun 15, 2011 at 5:46 PM, Morten Kloster wrote:
> On Wed, Jun 15, 2011 at 1:08 AM, Johan Corveleyn wrote:
[]
>> Intuitively, I'd say: let's look into patience diff (or a variation
>> thereof), because it's already being used in several (D)VCS'es, so it
>> has already had a lot of exposur
[Peter Samuelson]
> What I want is much simpler. Given a conflict region, make it smaller
> by removing lines from the top and bottom that do not actually differ.
> Don't eliminate the conflict entirely. My "proposal" does not lose any
> information; by reducing the size of the conflict region
> > While we're on the subject of 'diff wish', my wish is that diff3 could
> > remove lines from the top and bottom of a conflict region that are the
> > same on both "sides". Whether this happens as a natural part of the
> > implementation, o
On 16.06.2011 12:38, Neels J Hofmeyr wrote:
> On 06/15/2011 02:44 PM, Branko Čibej wrote:
>> GNU diff is a general-purpose diff tool. 'svn diff' is not.
> Then again, we now have 'svn patch' because some platforms "lack" general
> purpose commandline diff/patch tools. And we do already have specifi
> -Original Message-
> From: Branko Čibej [mailto:br...@xbc.nu] On Behalf Of Branko Cibej
> Sent: donderdag 16 juni 2011 12:33
> To: Daniel Shahaf
> Cc: Johan Corveleyn; Julian Foad; m.scha...@3s-software.com;
> dev@subversion.apache.org
> Subject: Re: diff wish
>
On 06/15/2011 02:44 PM, Branko Čibej wrote:
> GNU diff is a general-purpose diff tool. 'svn diff' is not.
Then again, we now have 'svn patch' because some platforms "lack" general
purpose commandline diff/patch tools. And we do already have specific
tweaking options for the internal diff: -u, -b,
On 16.06.2011 01:14, Daniel Shahaf wrote:
> Branko Čibej wrote on Wed, Jun 15, 2011 at 14:44:45 +0200:
>> On 15.06.2011 14:11, Johan Corveleyn wrote:
If you have a different definition of "mis-synchronizes", please explain.
>>> No, I don't mean a broken diff. The diff should at all times be
>>
Branko Čibej wrote on Wed, Jun 15, 2011 at 14:44:45 +0200:
> On 15.06.2011 14:11, Johan Corveleyn wrote:
> >> If you have a different definition of "mis-synchronizes", please explain.
> > No, I don't mean a broken diff. The diff should at all times be
> > *correct*. That was indeed never questioned
On Wed, Jun 15, 2011 at 5:41 PM, Greg Hudson wrote:
> On Wed, 2011-06-15 at 11:30 -0400, Johan Corveleyn wrote:
>> Okay, I guess we should then also rip out --ignore-space-change and
>> --ignore-eol-style, and perhaps --show-c-function. Or, if it's
>> preferred that ignore-space-change and ignore-
On Wed, Jun 15, 2011 at 1:08 AM, Johan Corveleyn wrote:
> On Tue, Jun 14, 2011 at 5:33 PM, Stefan Sperling wrote:
>> On Tue, Jun 14, 2011 at 05:21:27PM +0200, Neels J Hofmeyr wrote:
>>> Hi Johan,
>>>
>>> it's been a while and I still haven't sent
On Wed, 2011-06-15 at 11:30 -0400, Johan Corveleyn wrote:
> Okay, I guess we should then also rip out --ignore-space-change and
> --ignore-eol-style, and perhaps --show-c-function. Or, if it's
> preferred that ignore-space-change and ignore-eol-style be used by
> default ("because humans are normal
2011/6/15 Branko Čibej :
> On 15.06.2011 15:38, Johan Corveleyn wrote:
>> 2011/6/15 Branko Čibej :
>>> On 15.06.2011 14:11, Johan Corveleyn wrote:
> If you have a different definition of "mis-synchronizes", please explain.
No, I don't mean a broken diff. The diff should at all times be
>>>
Let's all take a breather and calm down before saying any more, shall
we?
- Julian
On Wed, Jun 15, 2011 at 5:15 PM, Greg Hudson wrote:
> On Wed, 2011-06-15 at 09:38 -0400, Johan Corveleyn wrote:
>> But I don't like the hand-waving discussion that it will always be
>> superior, period. That's just not true. And it would be a big mistake,
>> IMHO, to only support a heuristic diff.
On Wed, 2011-06-15 at 09:38 -0400, Johan Corveleyn wrote:
> But I don't like the hand-waving discussion that it will always be
> superior, period. That's just not true. And it would be a big mistake,
> IMHO, to only support a heuristic diff.
If it's a big mistake to use a "heuristic" diff by defau
On 15.06.2011 15:38, Johan Corveleyn wrote:
> 2011/6/15 Branko Čibej :
>> On 15.06.2011 14:11, Johan Corveleyn wrote:
If you have a different definition of "mis-synchronizes", please explain.
>>> No, I don't mean a broken diff. The diff should at all times be
>>> *correct*. That was indeed nev
2011/6/15 Branko Čibej :
> On 15.06.2011 14:11, Johan Corveleyn wrote:
>>> If you have a different definition of "mis-synchronizes", please explain.
>> No, I don't mean a broken diff. The diff should at all times be
>> *correct*. That was indeed never questioned.
>>
>> I mean something like the exa
Johan Corveleyn wrote:
> On Wed, Jun 15, 2011 at 1:24 PM, Julian Foad wrote:
> > On Wed, 2011-06-15 at 13:16 +0200, Johan Corveleyn wrote:
> >> On Wed, Jun 15, 2011 at 12:53 PM, Stefan Sperling wrote:
> >> But I'm not convinced that we should simply drop support for "minimal
> >> diffs" [...]
> >
On 15.06.2011 14:11, Johan Corveleyn wrote:
>> If you have a different definition of "mis-synchronizes", please explain.
> No, I don't mean a broken diff. The diff should at all times be
> *correct*. That was indeed never questioned.
>
> I mean something like the example Neels gave with his initial
On Wed, Jun 15, 2011 at 1:24 PM, Julian Foad wrote:
> On Wed, 2011-06-15 at 13:16 +0200, Johan Corveleyn wrote:
>> On Wed, Jun 15, 2011 at 12:53 PM, Stefan Sperling wrote:
>> > On Wed, Jun 15, 2011 at 12:34:31PM +0200, Branko Čibej wrote:
>> >> I'd say not to worry about --minimal and --nice and
Hi, Johan,
Von: Johan Corveleyn [mailto:jcor...@gmail.com]
> But I'm not convinced that we should simply drop support for "minimal
> diffs" when we arrive at the point that we have a "nice" format. A "nice"
> diff will always be based on heuristics, taking guesses at what should be
> considered a
On Wed, 2011-06-15 at 13:16 +0200, Johan Corveleyn wrote:
> On Wed, Jun 15, 2011 at 12:53 PM, Stefan Sperling wrote:
> > On Wed, Jun 15, 2011 at 12:34:31PM +0200, Branko Čibej wrote:
> >> I'd say not to worry about --minimal and --nice and whatnot. Just make
> >> diff output the sanest, nicest dif
On Wed, Jun 15, 2011 at 12:53 PM, Stefan Sperling wrote:
> On Wed, Jun 15, 2011 at 12:34:31PM +0200, Branko Čibej wrote:
>> I'd say not to worry about --minimal and --nice and whatnot. Just make
>> diff output the sanest, nicest diff it can find. I think it's a bad idea
>> to give diff user-visibl
On Wed, Jun 15, 2011 at 12:34:31PM +0200, Branko Čibej wrote:
> I'd say not to worry about --minimal and --nice and whatnot. Just make
> diff output the sanest, nicest diff it can find. I think it's a bad idea
> to give diff user-visible options that change the output in ways that
> are hard to exp
On 15.06.2011 01:08, Johan Corveleyn wrote:
> On Tue, Jun 14, 2011 at 5:33 PM, Stefan Sperling wrote:
>> On Tue, Jun 14, 2011 at 05:21:27PM +0200, Neels J Hofmeyr wrote:
>>> Hi Johan,
>>>
>>> it's been a while and I still haven't sent you my diff
On Tue, Jun 14, 2011 at 5:33 PM, Stefan Sperling wrote:
> On Tue, Jun 14, 2011 at 05:21:27PM +0200, Neels J Hofmeyr wrote:
>> Hi Johan,
>>
>> it's been a while and I still haven't sent you my diff wish we briefly
>> touched on the Subversion hackathon.
Hi Ne
On Tue, Jun 14, 2011 at 6:50 PM, Peter Samuelson wrote:
>
> [Neels J Hofmeyr]
>> it's been a while and I still haven't sent you my diff wish we briefly
>> touched on the Subversion hackathon.
>
> While we're on the subject of 'diff wish', my wis
[Neels J Hofmeyr]
> it's been a while and I still haven't sent you my diff wish we briefly
> touched on the Subversion hackathon.
While we're on the subject of 'diff wish', my wish is that diff3 could
remove lines from the top and bottom of a conflict region t
On Tue, Jun 14, 2011 at 05:21:27PM +0200, Neels J Hofmeyr wrote:
> Hi Johan,
>
> it's been a while and I still haven't sent you my diff wish we briefly
> touched on the Subversion hackathon.
>
> Here is a fabricated example of why I don't like diff to match empt
On 06/14/2011 05:33 PM, Stefan Sperling wrote:
> Do you know about patience diff?
> http://bramcohen.livejournal.com/73318.html
sounds pretty cool.
signature.asc
Description: OpenPGP digital signature
On Tue, Jun 14, 2011 at 05:21:27PM +0200, Neels J Hofmeyr wrote:
> Hi Johan,
>
> it's been a while and I still haven't sent you my diff wish we briefly
> touched on the Subversion hackathon.
>
> Here is a fabricated example of why I don't like diff to match empt
Hi Johan,
it's been a while and I still haven't sent you my diff wish we briefly
touched on the Subversion hackathon.
Here is a fabricated example of why I don't like diff to match empty lines:
[[[
Index: x
===
---
36 matches
Mail list logo
