You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by "Peter N. Lundblad" <pe...@famlundblad.se> on 2006/01/18 13:24:02 UTC

Re: svn trunk r18150: FAIL (win32 ra_local bdb VS2005)

Malcolm,

> CMD: svn.exe "diff" "-r" "1" "--config-dir" "M:\tests-local\subversion\tests\cmdline\svn-test-work\local_tmp\config" <TIME = 0.094000>
> EXPECTED STDOUT:
> Index: foo
> ===================================================================
> --- foo	(revision 0)
> +++ foo	(revision 3)
> @@ -0,0 +1 @@
> +content
>
> Property changes on: foo
> ___________________________________________________________________
> Name: propname
>    + propvalue
>
>
> Property changes on: X
> ___________________________________________________________________
> Name: propname
>    + propvalue
>
> Index: X/bar
> ===================================================================
> --- X/bar	(revision 0)
> +++ X/bar	(revision 3)
> @@ -0,0 +1 @@
> +content
>
> Property changes on: X/bar
> ___________________________________________________________________
> Name: propname
>    + propvalue
>
> ACTUAL STDOUT:
> Index: foo
> ===================================================================
> --- foo	(revision 0)
> +++ foo	(revision 3)
> @@ -0,0 +1 @@
> +content
>
> Property changes on: foo
> ___________________________________________________________________
> Name: propname
>    + propvalue
>
>
> Property changes on: X
> ___________________________________________________________________
> Name: propname
>    + propvalue
>
> Index: X/bar
> ===================================================================
> --- X/bar	(revision 0)
> +++ X/bar	(revision 3)
> @@ -0,0 +1 @@
> +content
>
> Property changes on: X\bar
> ___________________________________________________________________
> Name: propname
>    + propvalue
>
> EXCEPTION: SVNLineUnequal
> FAIL:  diff_tests.py 32: repos-wc diff showing added entries with props
> END: diff_tests.py

...And everyone who just skims this quickly will see the obvious
difference in the above (just kidding, diff was my friend here:-).

When we output "Property changes for 'path':", we use the local path
separator, i.e. backslash on Windows. This is inconsistent with the other
lines where we output paths. I guess this is your latest work on the diff
code, Malcolm.  (BTW, are you on the breakage list?  That's very useful in
situations like this.)

Thanks,
//Peter

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: svn trunk r18150: FAIL (win32 ra_local bdb VS2005)

Posted by Malcolm Rowe <ma...@farside.org.uk>.
On Wed, Jan 18, 2006 at 02:24:02PM +0100, Peter N. Lundblad wrote:
> Malcolm,
> 
> [...]
> 
> When we output "Property changes for 'path':", we use the local path
> separator, i.e. backslash on Windows. This is inconsistent with the other
> lines where we output paths. I guess this is your latest work on the diff
> code, Malcolm.  (BTW, are you on the breakage list?  That's very useful in
> situations like this.)
> 

Oh, that's annoying.  I had thought there was a difference, but then
I looked at the diff labels and assumed I'd been making things up.
I suppose the discrepancy makes _some_ sense: diff labels are read by
'patch', so probably should stay in UNIX-style; property changes aren't,
so should be in the preferred local style.

Anyway, yes, that's mine.  I've just checked in what should be a fix for
this (r18152), though I can't run the tests on Windows-native to check
(cygwin's the best I can do, and it uses UNIX-style paths, as far as I
can see).

I'm not subscribed to svn-breakage: I wanted to, but I didn't want to
get flooded with 'PASS' messages, which I didn't typically care about,
and SWIG-related FAILs, which I couldn't typically do anything about.
Though now I think about it, I should be able to filter those out
locally...

Regards,
Malcolm

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org