[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r17190 - trunk/subversion/libsvn_wc

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: 2005-11-07 02:15:14 CET

Daniel Berlin wrote:
> On Mon, 2005-11-07 at 00:06 +0000, Julian Foad wrote:
>
>>Daniel Berlin wrote (earlier):
>>
>>>>$ svn diff -r0 wc
>>>>Index: /tmp/tmp
>>>>===================================================================
>>>>Index: wc/foo
>>>>===================================================================
>>>>--- wc/foo (revision 0)
>>>>+++ wc/foo (working copy)
>>>>@@ -1 +0,0 @@
>>>>-xxx
>>>>
>>>>It's that really the correct output?
>>>
>>>That's not the output i get, but i've got an external diff configured :(
>>
>>Well, what output do you get? Philip replied "External diff makes no
>>difference as far as I can see." If you got something similar to this, don't
>>you agree it's wrong?
>
> Similar, but not the same.
>
> I only get the Index: wc/foo part.
>
> I get no Index: /tmp/tmp line.

Well, that's curious. Philip, are you sure it was different for you?

[...]
>>Daniel, it's great that you're so quick to come up with a new fix, but please
>>repost the patch with its log message (and "[PATCH]" in the subject line) and
>>hold off committing until tomorrow to give the weekday workers a chance to
>>review it and check whether it's the right fix.
>
> Julian: I don't know what gives you the idea that what i say means i
> wouldn't follow the rules in hacking.html, but i have in the past, and
> will in the future.

Oops. I realised that was a bit ... inflammatory? presumptuous? ... as soon as
I sent it. Sorry, but I got the impression you were going to commit it within
minutes.

Also, I've just noticed that your patch file was called "forphilip.diff". If I
had noticed that previously I might have realised it wasn't yet intended for
all of us readers, but I didn't.

[...]
> As for the test below, i fixed it well before your email, but ...

>>There's no need to create and add a file: the default test repository already
>>has one, called "iota", in order to save test writers from this chore.
>
> But it won't help in this case, for the reasons below.
[...]
> The bug only tickles when you are comparing a revision the file was
> added in.
> Thus, you can't use iota, because it's revision includes the othe
> rfiles, and excluding them won't work.
> You actually have to add a new file, commit it, remove it, and then diff
> *that* revision, to be able to compare out.

Oh. I'm not following the details exactly, but OK. Thanks for explaining.

- Julian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Nov 7 02:16:04 2005

This is an archived mail posted to the Subversion Dev mailing list.