History | Log In     View a printable version of the current page.  
Issue Details (XML | Word | Printable)

Key: IDEADEV-33102
Type: Bug Bug
Status: Open Open
Priority: Normal Normal
Assignee: Anna Kozlova
Reporter: Otto Niehaus
Votes: 0
Watchers: 2
Operations

If you were logged in you would be able to see more operations.
IDEA: Development

wrong .classpath after merge

Created: 19 Aug 08 16:46   Updated: Monday 15:48
Component/s: Version Control Integration. CVS, Diff/Merge
Fix Version/s: None

Original Estimate: Unknown Remaining Estimate: Unknown Time Spent: Unknown

Build: 7,941


 Description  « Hide
If a project is configured to store the dependencies in Eclipse format (".classpath" file) and two users change the classpath (e.g. user1 add library A, user2 add library B) and commit the changes into CVS, then the second user must first update the .classpath file (it is not up-to-date). The dialog "Files Merged With Conflict" appears and the user press the "Merge" button. Then he merge the changes and press "Save and Finish" in the dialog "All Changes Processed".
After that a dialog appears that a project file was changed and the user press "Reload Project".
Sometimes after that procedure the .classpath file has no library entries anymore. It doesn't contain the merge result.

 All   Comments   Work Log   Change History      Sort Order:
There are no comments yet on this issue.