You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Marcus Comstedt <ma...@mc.pp.se> on 2003/02/27 20:28:12 UTC
Current diff failures
Hello.
I've not been reading the list for a while so don't kill me if this
has been beaten to death already, ok? :-)
There are many diff tests failing now, after the switch to internal
diff(?):
FAIL: diff-diff3-test 1: these dump core
FAIL: diff-diff3-test 6: three way merge with conflicting overlapping changes
FAIL: diff_tests.py 2: add a file
FAIL: diff_tests.py 3: add a file in an added directory
FAIL: diff_tests.py 4: replace a file with a file
FAIL: diff_tests.py 5: multiple revisions diff'd forwards and backwards
FAIL: diff_tests.py 7: diff only part of the repository
FAIL: diff_tests.py 9: pure repository diff update a file
FAIL: merge_tests.py 2: merge and add new files/dirs with history
The common denominator seems to be that at least one of the diffed
files is empty, and the error is
svn: Not enough space
svn: Failed to mmap file 'whatever'.
Should I take it that this is an instance of issue 1019, on account of
empty files being "binary"?
// Marcus
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Current diff failures
Posted by Philip Martin <ph...@codematters.co.uk>.
Ben Collins-Sussman <su...@collab.net> writes:
> Marcus Comstedt <ma...@mc.pp.se> writes:
>
> > FAIL: diff-diff3-test 1: these dump core
> > FAIL: diff-diff3-test 6: three way merge with conflicting overlapping changes
> Is your BDB messed up somehow?
These don't use BDB.
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Current diff failures
Posted by Ben Collins-Sussman <su...@collab.net>.
Marcus Comstedt <ma...@mc.pp.se> writes:
> There are many diff tests failing now, after the switch to internal
> diff(?):
>
> FAIL: diff-diff3-test 1: these dump core
> FAIL: diff-diff3-test 6: three way merge with conflicting overlapping changes
> FAIL: diff_tests.py 2: add a file
> FAIL: diff_tests.py 3: add a file in an added directory
> FAIL: diff_tests.py 4: replace a file with a file
> FAIL: diff_tests.py 5: multiple revisions diff'd forwards and backwards
> FAIL: diff_tests.py 7: diff only part of the repository
> FAIL: diff_tests.py 9: pure repository diff update a file
> FAIL: merge_tests.py 2: merge and add new files/dirs with history
They all pass for me, as well as everyone else I know. This is the
first I've heard of anyone having a problem...
> The common denominator seems to be that at least one of the diffed
> files is empty, and the error is
>
> svn: Not enough space
> svn: Failed to mmap file 'whatever'.
Not enough space? Can't mmap?
Is your BDB messed up somehow?
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Current diff failures
Posted by Marcus Comstedt <ma...@mc.pp.se>.
Philip Martin <ph...@codematters.co.uk> writes:
> They pass on my Linux box. It's probably this:
>
> rev 5127: striker | 2003-02-27 08:11:18 +0000 (Thu, 27 Feb 2003) | 13 lines
>
> * subversion/libsvn_delta/diff_file.c
>
> (svn_diff__file_datasource_open): mmap the file if we have mmap
> available.
Indeed. Downreving this file to 5126 makes the problem go away.
My system is Solaris8/SPARC.
> I think an empty file should be acceptable as a text file.
Ideally, yes. They don't contain any linefeeds though, which seems to
have been thing about binary files that has caused problems before.
// Marcus
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Current diff failures
Posted by Philip Martin <ph...@codematters.co.uk>.
Marcus Comstedt <ma...@mc.pp.se> writes:
> There are many diff tests failing now, after the switch to internal
> diff(?):
They pass on my Linux box. It's probably this:
rev 5127: striker | 2003-02-27 08:11:18 +0000 (Thu, 27 Feb 2003) | 13 lines
* subversion/libsvn_delta/diff_file.c
(svn_diff__file_datasource_open): mmap the file if we have mmap
available.
> Should I take it that this is an instance of issue 1019, on account of
> empty files being "binary"?
I think an empty file should be acceptable as a text file.
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Current diff failures
Posted by Marcus Comstedt <ma...@mc.pp.se>.
"Sander Striker" <st...@apache.org> writes:
> > There are many diff tests failing now, after the switch to internal
> > diff(?):
>
> Nah, after introducing mmap'ing of files instead of loading the contents
> into freshly allocated memory.
Ok. It was 3 months since I updated my sources the last time... ^^;;
> Fixed in rev 5150.
Verified, this version works for me.
// Marcus
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
RE: Current diff failures
Posted by Sander Striker <st...@apache.org>.
> From: Marcus Comstedt [mailto:marcus@mc.pp.se]
> Sent: Thursday, February 27, 2003 9:28 PM
> Hello.
>
> I've not been reading the list for a while so don't kill me if this
> has been beaten to death already, ok? :-)
>
> There are many diff tests failing now, after the switch to internal
> diff(?):
Nah, after introducing mmap'ing of files instead of loading the contents
into freshly allocated memory.
> The common denominator seems to be that at least one of the diffed
> files is empty, and the error is
>
> svn: Not enough space
> svn: Failed to mmap file 'whatever'.
Fixed in rev 5150.
Sander
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org