You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-dev@db.apache.org by Laura Stewart <sc...@gmail.com> on 2007/03/20 00:37:30 UTC
Unusual error creating diff file
When I attempt to create a diff file, I get this error
C:\Authoring\Forrest\Derby\trunk>svn diff > docpages031907_3.diff
svn: File 'build\site\skin\print.css' has inconsistent newlines
svn: Inconsistent line ending style.
However, the forrest site command runs successfully.
Any ideas?
--
Laura Stewart
Re: Unusual error creating diff file
Posted by "Jean T. Anderson" <jt...@bristowhill.com>.
Laura Stewart wrote:
> On 3/19/07, Jean T. Anderson <jt...@bristowhill.com> wrote:
>
>> And, huh!, I remember now that I meant to tell Windows users to 'svn
>> revert' those files. Current wording still leaves one with the
>> impression that they could be committed:
>>
> Okay, easily done. Do you want me to add this to the Documentation
> commit section, since I am working on those files now?
sure, that'd be great -- thanks!
-jean
Re: Unusual error creating diff file
Posted by Laura Stewart <sc...@gmail.com>.
On 3/19/07, Jean T. Anderson <jt...@bristowhill.com> wrote:
>
> And, huh!, I remember now that I meant to tell Windows users to 'svn
> revert' those files. Current wording still leaves one with the
> impression that they could be committed:
>
Okay, easily done. Do you want me to add this to the Documentation
commit section, since I am working on those files now?
--
Laura Stewart
Re: Unusual error creating diff file
Posted by Laura Stewart <sc...@gmail.com>.
On 3/19/07, Jean T. Anderson <jt...@bristowhill.com> wrote:
> umm, without the quotes:
>
> svn revert build\site\skin\*
Right, I already took them out :-)
--
Laura Stewart
Re: Unusual error creating diff file
Posted by "Jean T. Anderson" <jt...@bristowhill.com>.
Jean T. Anderson wrote:
> Laura Stewart wrote:
>
>>When I attempt to create a diff file, I get this error
>>
>>C:\Authoring\Forrest\Derby\trunk>svn diff > docpages031907_3.diff
>>svn: File 'build\site\skin\print.css' has inconsistent newlines
>>svn: Inconsistent line ending style.
>>
>>However, the forrest site command runs successfully.
>>Any ideas?
>
>
> I'm kind of surprised that you got that error with the 'svn diff'
> command -- I often don't see that until I try to actually commit.
>
> Anyhow, revert changes to the skin files:
>
> 'svn revert' build\site\skin\*
umm, without the quotes:
svn revert build\site\skin\*
sorry,
-jean
>
> Problems with the skin files are documented at
> http://db.apache.org/derby/papers/derby_web.html#odd_diffs .
> And, huh!, I remember now that I meant to tell Windows users to 'svn
> revert' those files. Current wording still leaves one with the
> impression that they could be committed:
>
>
>>It's harmless to commit those files, though it does add some minor bloat to the Derby repository, and it's also harmless to svn revert them. And it's certainly confusing!
>
>
> regards,
>
> -jean
Re: Unusual error creating diff file
Posted by "Jean T. Anderson" <jt...@bristowhill.com>.
Laura Stewart wrote:
> When I attempt to create a diff file, I get this error
>
> C:\Authoring\Forrest\Derby\trunk>svn diff > docpages031907_3.diff
> svn: File 'build\site\skin\print.css' has inconsistent newlines
> svn: Inconsistent line ending style.
>
> However, the forrest site command runs successfully.
> Any ideas?
I'm kind of surprised that you got that error with the 'svn diff'
command -- I often don't see that until I try to actually commit.
Anyhow, revert changes to the skin files:
'svn revert' build\site\skin\*
Problems with the skin files are documented at
http://db.apache.org/derby/papers/derby_web.html#odd_diffs .
And, huh!, I remember now that I meant to tell Windows users to 'svn
revert' those files. Current wording still leaves one with the
impression that they could be committed:
> It's harmless to commit those files, though it does add some minor bloat to the Derby repository, and it's also harmless to svn revert them. And it's certainly confusing!
regards,
-jean