This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

Bug 25430

Summary:	cvs update puts ctrl-ms in files
Product:	versioncontrol	Reporter:	bwl <bwl>
Component:	CVS library	Assignee:	issues@versioncontrol <issues>
Status:	NEW ---
Severity:	blocker	Keywords:	SIMPLEFIX
Priority:	P2
Version:	3.x
Hardware:	PC
OS:	Windows ME/2000
Issue Type:	ENHANCEMENT	Exception Reporter:
Attachments:	The patch adds a System property that can be set to force use of either Unix or Windows line end convention.

Description bwl 2002-07-09 01:54:31 UTC

When using the internal CVS client, calling CVS update 
puts control-Ms in files that have been checked into CVS 
without control-Ms.  Although the NetBeans handles this 
well (not treating this as a diff etc) it does tend to 
create problems.

These files are actually on a Unix server filesystem, and 
we tend to also use the command-line CVS on the Unix 
server, and so people commonly end up checking in files 
containing control-Ms.   It would be helpful if the 
internal CVS client had an option to allow checkouts and 
updates to not put control-Ms in files.

Comment 1 Milos Kleint 2002-07-09 07:48:56 UTC

The situation you describe happens only when you checkout on windows
and commit on unix.
We take the OS native line endings into account when checking out,
commiting.
Please double check your files commited to repository. If soneone
commited them with bad lineending (using the Unix+windows
checkout/commit pair) then it will checkout the sources badly. Does a
checkout on Windows add an extra line everywhere?

What kind of unix are you using? what version of JDK?

Comment 2 bwl 2002-07-10 00:14:10 UTC

Milos, our environment is Windows (NT/2000) and AIX.  (JDK 
1.4.0 on Windows).  The problem is that we know we are 
working in this mixed environment, and developers 
frequently mistakenly checkin files with control-m (by 
using CVS on the AIX server).  The neatest solution, I 
thought, would be if NetBeans allowed you to not use DOS 
style line endings on checkout under Windows - as a user 
configurable option.

As an aside, the files are typically first checked out on 
Unix, then mounted in NetBeans.  Therefore they don't 
initially have control-Ms.  However, when an update is 
performed, NetBeans adds control-Ms (to updated files).  
In some ways it would seem more logical to respect the 
current line-ending of the files when doing an update, 
rather than looking to the platform default.

Comment 3 Milos Kleint 2002-07-10 07:04:37 UTC

I'm not a fan of such approach, however it's technically possible and
quite easy to do. Leaving for Martin Entlicher to consider as one of
the features for 4.0

Comment 4 Martin Entlicher 2002-08-07 17:03:33 UTC

Certainly not for 4.0. We have many others features to implement and
limited resources :-((
Changing Target Milestone to TBD (to be determined).

Comment 5 Martin Entlicher 2003-06-19 13:57:07 UTC

Changing subcomponent to "library" as this needs to be implemented in
the cvs client library.

Comment 6 bwl 2004-08-18 07:37:47 UTC

Created attachment 16902 [details]
The patch adds a System property that can be set to force use of either Unix or Windows line end convention.