sorry ... it is $ svn propset svn:eol-style native specialpurpose/projectmgr/widget/forms/ProjectForms.xml svn: File 'specialpurpose/projectmgr/widget/forms/ProjectForms.xml' has inconsistent newlines svn: Inconsistent line ending style
On Wed, Mar 5, 2008 at 8:08 PM, Vikas Mayur <[EMAIL PROTECTED]> wrote: > Thanks Christian, you are right indeed. > > Just another question around this topic. Here is what I try to do with > specialpurpose/projectmgr/widget/forms/ProjectForms.xml > > $ svn propset svn:eol-style native > specialpurpose/projectmgr/widget/forms/ProjectForms.xml > $ svn: File 'specialpurpose/projectmgr/widget/forms/ProjectForms.xml' has > inconsistent newlines > $ svn: Inconsistent line ending style > > What should be done in this case to set this property. > > > Vikas > > > On Wed, Mar 5, 2008 at 6:31 PM, Christian Geisert < > [EMAIL PROTECTED]> wrote: > > > Vikas Mayur schrieb: > > > The actual patch has only a single line modification. I am not sure > > but I > > > may be doing any thing wrong here while committing the code. The > > commit > > > appears to have a lot of changes in the ProjectScreens.xml file, but > > the > > > actual changes to trunk has also a single line modification. > > > > > > > > > <screen name="NoteInfo"> > > > <section> > > > <actions> > > > - <set field="workEffortId" from-field=" > > > parameters.workEffortId"/> > > > + <set field="workEffortId" from-field="projectId" /> > > > <entity-and entity-name="WorkEffortNoteAndData" > > > list-name="workEffortNoteandDetails"> > > > <field-map field-name="workEffortId" > > > env-name="workEffortId"/> > > > <order-by field-name="-noteDateTime"/> > > > > > > Can any body point me if I am doing any thing wrong here. > > > > This is the result of a missing svn:eol-style property :-| > > > > If someone checks in a file with Windows linefeeds and then > > someone else edits this file under Linux all lines are changed - > > setting 'svn:eol-style' as 'native' fixes this problem. > > > > We should check the whole repository for missing eol-style properties - > > I'll try to find some time today. > > > > Doing a 'svn diff' before the commit helps avoiding these kind of > > problems ;-) > > > > -- > > Christian > > > > >
