You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by "Brent R. Matzelle" <bm...@yahoo.com> on 2002/07/30 23:19:42 UTC
svn propset:eol-style commit error
Hello gentlemen,
I just did a large commit that changed several files to eol-style
native and received the error below. Does this present a problem?
Brent
svn_error: #21002 : <A general problem occured>
Commit succeeded, but other errors follow:
svn_error: #21046 : <Problem running log>
Error bumping revisions post-commit (details follow):
svn_error: #21046 : <Problem running log>
in directory C:/dev/rapidsvn/src
svn_error: #21046 : <Problem running log>
start_handler: error processing command 'committed' in
C:/dev/rapidsvn/src
svn_error: #21046 : <Problem running log>
error replacing text-base: action_thread.h
svn_error: #21030 : <Inconsistent line ending style>
C:/dev/rapidsvn/src/action_thread.h
__________________________________________________
Do You Yahoo!?
Yahoo! Health - Feel better, live better
http://health.yahoo.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn propset:eol-style commit error
Posted by Philip Martin <ph...@codematters.co.uk>.
"Brent R. Matzelle" <bm...@yahoo.com> writes:
> I just did a large commit that changed several files to eol-style
> native and received the error below. Does this present a problem?
>
> svn_error: #21030 : <Inconsistent line ending style>
> C:/dev/rapidsvn/src/action_thread.h
Issue 601 :-/
http://subversion.tigris.org/issues/show_bug.cgi?id=601
"eol conversion and keyword expansion need regression tests"
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn propset:eol-style commit error
Posted by "Brent R. Matzelle" <bm...@yahoo.com>.
--- Garrett Rooney <ro...@electricjellyfish.net> wrote:
> On Tue, Jul 30, 2002 at 07:23:40PM -0400, Garrett Rooney wrote:
> > On Tue, Jul 30, 2002 at 04:19:42PM -0700, Brent R. Matzelle
> wrote:
> > > Hello gentlemen,
> > >
> > > I just did a large commit that changed several files to
> eol-style
> > > native and received the error below. Does this present a
> problem?
> >
> > yes. there are files in the repository wiht mixed windows and
> unix
> > line endings, so subversion is failing to do the conversion to
> native
> > when you try to update or check out the code.
>
> actually, i'm wrong. it turns out svn will handle it fine if you
> download the directory from scratch, but if your text base files
> already have mixed line endings (mine did, yours seem to, sussmans
> didn't for some reason), you will get the error.
>
> i just blew away rapidsvn/src and 'svn up'd and it worked.
That worked nicely. Thanks.
Brent
__________________________________________________
Do You Yahoo!?
Yahoo! Health - Feel better, live better
http://health.yahoo.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn propset:eol-style commit error
Posted by Garrett Rooney <ro...@electricjellyfish.net>.
On Tue, Jul 30, 2002 at 07:23:40PM -0400, Garrett Rooney wrote:
> On Tue, Jul 30, 2002 at 04:19:42PM -0700, Brent R. Matzelle wrote:
> > Hello gentlemen,
> >
> > I just did a large commit that changed several files to eol-style
> > native and received the error below. Does this present a problem?
>
> yes. there are files in the repository wiht mixed windows and unix
> line endings, so subversion is failing to do the conversion to native
> when you try to update or check out the code.
actually, i'm wrong. it turns out svn will handle it fine if you
download the directory from scratch, but if your text base files
already have mixed line endings (mine did, yours seem to, sussmans
didn't for some reason), you will get the error.
i just blew away rapidsvn/src and 'svn up'd and it worked.
-garrett
--
garrett rooney Remember, any design flaw you're
rooneg@electricjellyfish.net sufficiently snide about becomes
http://electricjellyfish.net/ a feature. -- Dan Sugalski
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn propset:eol-style commit error
Posted by Garrett Rooney <ro...@electricjellyfish.net>.
On Tue, Jul 30, 2002 at 04:19:42PM -0700, Brent R. Matzelle wrote:
> Hello gentlemen,
>
> I just did a large commit that changed several files to eol-style
> native and received the error below. Does this present a problem?
yes. there are files in the repository wiht mixed windows and unix
line endings, so subversion is failing to do the conversion to native
when you try to update or check out the code.
we need to change the svn:eol-style back, then fix the code to have
the same line endings. unfortunately this will be a bit difficult if
one cannot get a valid working copy to play with so you can do the
'svn merge'.
any suggestions guys?
all i can think of is doing a remote 'svn cp' to copy the previous
revision over the current revision. that would likely get rid of it.
-garrett
--
garrett rooney Remember, any design flaw you're
rooneg@electricjellyfish.net sufficiently snide about becomes
http://electricjellyfish.net/ a feature. -- Dan Sugalski
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org