You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Garrett Rooney <ro...@electricjellyfish.net> on 2006/03/16 01:50:29 UTC
Change in behavior of libsvn_wc with inconsistent eol on trunk
So it seems that as part of our changes to the working copy library in
trunk we changed some behavior with regard to how we deal with
inconsistent eols. Previously if you managed to get inconsistent eols
checked into the repository along with an svn:eol-style of native you
could at least check out the file, remove the svn:eol-style, and get
on with your life. Now, we fail on checkout with an error about the
text base having inconsistent newlines:
svn: In directory 'whatever'
svn: File 'whatever/.svn/tmp/text-base/something-or-other.dia.svn-base'
has inconsistent newlines
svn: Inconsistent line ending style
This isn't especially friendly, since without the ability to check out
the working copy there isn't actually any way to remove the property,
since propdel doesn't work on URLs.
Now in a perfect world we wouldn't have files like this in the
repository, but it seems that they do get there. I wouldn't be
surprised to see them as the result of some cvs2svn mess ups, and in
the case I actually observed it was through addition via an old client
that apparently didn't check for such things.
-garrett
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Change in behavior of libsvn_wc with inconsistent eol on trunk
Posted by Garrett Rooney <ro...@electricjellyfish.net>.
On 3/22/06, Garrett Rooney <ro...@electricjellyfish.net> wrote:
> On 22 Mar 2006 08:41:10 -0600, kfogel@collab.net <kf...@collab.net> wrote:
> > "Peter N. Lundblad" <pe...@famlundblad.se> writes:
> > > Garrett Rooney writes:
> > > > So it seems that as part of our changes to the working copy library in
> > > > trunk we changed some behavior with regard to how we deal with
> > > > inconsistent eols. Previously if you managed to get inconsistent eols
> > > > checked into the repository along with an svn:eol-style of native you
> > > > could at least check out the file, remove the svn:eol-style, and get
> > > > on with your life. Now, we fail on checkout with an error about the
> > > > text base having inconsistent newlines:
> > > >
> > > > svn: In directory 'whatever'
> > > > svn: File 'whatever/.svn/tmp/text-base/something-or-other.dia.svn-base'
> > > > has inconsistent newlines
> > > > svn: Inconsistent line ending style
> > >
> > > I agree that this behaviour isn't very good and think we should change
> > > this back to allow the above.
> >
> > Yes, this is a clear regression. (Is there an issue filed?)
>
> Not yet, I will file one today if nobody else beats me to it.
For the curious, I opened this as issue #2529.
-garrett
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Change in behavior of libsvn_wc with inconsistent eol on trunk
Posted by Garrett Rooney <ro...@electricjellyfish.net>.
On 22 Mar 2006 08:41:10 -0600, kfogel@collab.net <kf...@collab.net> wrote:
> "Peter N. Lundblad" <pe...@famlundblad.se> writes:
> > Garrett Rooney writes:
> > > So it seems that as part of our changes to the working copy library in
> > > trunk we changed some behavior with regard to how we deal with
> > > inconsistent eols. Previously if you managed to get inconsistent eols
> > > checked into the repository along with an svn:eol-style of native you
> > > could at least check out the file, remove the svn:eol-style, and get
> > > on with your life. Now, we fail on checkout with an error about the
> > > text base having inconsistent newlines:
> > >
> > > svn: In directory 'whatever'
> > > svn: File 'whatever/.svn/tmp/text-base/something-or-other.dia.svn-base'
> > > has inconsistent newlines
> > > svn: Inconsistent line ending style
> >
> > I agree that this behaviour isn't very good and think we should change
> > this back to allow the above.
>
> Yes, this is a clear regression. (Is there an issue filed?)
Not yet, I will file one today if nobody else beats me to it.
-garrett
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Change in behavior of libsvn_wc with inconsistent eol on trunk
Posted by kf...@collab.net.
"Peter N. Lundblad" <pe...@famlundblad.se> writes:
> Garrett Rooney writes:
> > So it seems that as part of our changes to the working copy library in
> > trunk we changed some behavior with regard to how we deal with
> > inconsistent eols. Previously if you managed to get inconsistent eols
> > checked into the repository along with an svn:eol-style of native you
> > could at least check out the file, remove the svn:eol-style, and get
> > on with your life. Now, we fail on checkout with an error about the
> > text base having inconsistent newlines:
> >
> > svn: In directory 'whatever'
> > svn: File 'whatever/.svn/tmp/text-base/something-or-other.dia.svn-base'
> > has inconsistent newlines
> > svn: Inconsistent line ending style
>
> I agree that this behaviour isn't very good and think we should change
> this back to allow the above.
Yes, this is a clear regression. (Is there an issue filed?)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Change in behavior of libsvn_wc with inconsistent eol on trunk
Posted by "Peter N. Lundblad" <pe...@famlundblad.se>.
Garrett Rooney writes:
> So it seems that as part of our changes to the working copy library in
> trunk we changed some behavior with regard to how we deal with
> inconsistent eols. Previously if you managed to get inconsistent eols
> checked into the repository along with an svn:eol-style of native you
> could at least check out the file, remove the svn:eol-style, and get
> on with your life. Now, we fail on checkout with an error about the
> text base having inconsistent newlines:
>
> svn: In directory 'whatever'
> svn: File 'whatever/.svn/tmp/text-base/something-or-other.dia.svn-base'
> has inconsistent newlines
> svn: Inconsistent line ending style
>
I agree that this behaviour isn't very good and think we should change
this back to allow the above.
Regards,
//Peter
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org