Community
Participate
Working Groups
Build Identifier: Version: 3.7.1.r37x_v20110729-9gF7UHOxFtniV7mI3T556iZN9AU8bEZ1lHMcVK Build id: M20110909-1335 This bug occurs: 1. When the files are in UNIX format mapped from a linux machine (or cygwin) 2. When using synchronise perspective to update files before committing local changes. 3. When there are local edits and local version is older than the CVS repository version such that the red conflict indicator shows in the synchronise file list. 4. The changes are non-conflicting such that cvs update should merge the repository updates correctly If at this stage you right-click on the file with the red arrow and select "update", then Eclipse will merge the changes, but will also convert all line endings to DOS format. To workaround I need to double-click the file to open the compare viewer. Then right-click on the "Local File" pane and select team->update. This causes the changes to merge without the line endings to be changed. Reproducible: Always Steps to Reproduce: 1. Ensure that your files are checked out in UNIX format (linux drive mapped to windows for example, or cygwin). 2. Ensure the local file is not up-to-date with the repository and also contains non-conflicting local edits. 3. From synchronise perspective, in the file list right click on the file with the red conflicts decoration and select update (I think the "Update All Incoming Changes..." button will do the same).
This bug hasn't had any activity in quite some time. Maybe the problem got resolved, was a duplicate of something else, or became less pressing for some reason - or maybe it's still relevant but just hasn't been looked at yet. If you have further information on the current state of the bug, please add it. The information can be, for example, that the problem still occurs, that you still want the feature, that more information is needed, or that the bug is (for whatever reason) no longer relevant. If the bug is still relevant, please remove the "stalebug" whiteboard tag.
