You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Joe Swatosh <jo...@gmail.com> on 2007/08/12 23:34:05 UTC

Re: svn commit: r26049 - trunk/subversion/libsvn_diff

Hi

On 8/12/07, dionisos@tigris.org <di...@tigris.org> wrote:
> Author: dionisos
> Date: Sun Aug 12 14:25:04 2007
> New Revision: 26049
>
> Log:
> Make svn_diff__normalize_buffer() aggressively try *not* to copy data
> (instead returning a pointer to already normalized input), but when it does,
> make it use a specified output buffer.
>
> This change enables callers to pass original content (which should
> not be modified).  A required change to make in-memory diffing support
> normalization.
>
>

>

This change also causes new Ruby bindings test failures on windows:

  1) Failure:
test_diff_merge(SvnCoreTest)
[D:/SVN/src-trunk/subversion/bindings/swig/ruby/test/test_core.rb:482]:
<"\r\n b\r\n\r\nd\r\ne\r\n"> expected but was
<"\r\n  b\r\n\r\nd\r\n e\r\n">.

  2) Failure:
test_diff_unified(SvnCoreTest)
[D:/SVN/src-trunk/subversion/bindings/swig/ruby/test/test_core.rb:404]:
<"--- (orig)\r\n+++ (mod)\r\n@@ -1,3 +1,3 @@\r\n   a\r\n-b\r\n+\r\n
c\r\n"> expected but was
<"--- (orig)\r\n+++ (mod)\r\n@@ -1,3 +1,3 @@\r\n-  a\r\n-b\r\n-
c\r\n+a\r\n+\r\n+ c\r\n">.

--
Joe

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

Re: svn commit: r26049 - trunk/subversion/libsvn_diff

Posted by Joe Swatosh <jo...@gmail.com>.
Hi

On 8/13/07, Erik Huelsmann <eh...@gmail.com> wrote:

> >
> > This change also causes new Ruby bindings test failures on windows:
> >
> >  1) Failure:
> > test_diff_merge(SvnCoreTest)
> > [D:/SVN/src-trunk/subversion/bindings/swig/ruby/test/test_core.rb:482]:
> > <"\r\n b\r\n\r\nd\r\ne\r\n"> expected but was
> > <"\r\n  b\r\n\r\nd\r\n e\r\n">.
>
> Thanks for the report. I'm indeed expecting problems with test with
> leading whitespace in the file. I hope to have it fixed tonight.
>

>

Its now working again as of r26069.  Thanks!
--
Joe

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

Re: svn commit: r26049 - trunk/subversion/libsvn_diff

Posted by Erik Huelsmann <eh...@gmail.com>.
On 8/13/07, Joe Swatosh <jo...@gmail.com> wrote:
> Hi
>
> On 8/12/07, dionisos@tigris.org <di...@tigris.org> wrote:
> > Author: dionisos
> > Date: Sun Aug 12 14:25:04 2007
> > New Revision: 26049
> >
> > Log:
> > Make svn_diff__normalize_buffer() aggressively try *not* to copy data
> > (instead returning a pointer to already normalized input), but when it does,
> > make it use a specified output buffer.
> >
> > This change enables callers to pass original content (which should
> > not be modified).  A required change to make in-memory diffing support
> > normalization.
> >
> >
>
> >
>
> This change also causes new Ruby bindings test failures on windows:
>
>  1) Failure:
> test_diff_merge(SvnCoreTest)
> [D:/SVN/src-trunk/subversion/bindings/swig/ruby/test/test_core.rb:482]:
> <"\r\n b\r\n\r\nd\r\ne\r\n"> expected but was
> <"\r\n  b\r\n\r\nd\r\n e\r\n">.

Thanks for the report. I'm indeed expecting problems with test with
leading whitespace in the file. I hope to have it fixed tonight.

bye,

Erik.
PS: I have a small reproduction recipe for inclusion into
diff-diff3-test.c to prevent future problems of the same type.


>  2) Failure:
> test_diff_unified(SvnCoreTest)
> [D:/SVN/src-trunk/subversion/bindings/swig/ruby/test/test_core.rb:404]:
> <"--- (orig)\r\n+++ (mod)\r\n@@ -1,3 +1,3 @@\r\n   a\r\n-b\r\n+\r\n
> c\r\n"> expected but was
> <"--- (orig)\r\n+++ (mod)\r\n@@ -1,3 +1,3 @@\r\n-  a\r\n-b\r\n-
> c\r\n+a\r\n+\r\n+ c\r\n">.
>
> --
> Joe
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
>
>

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