Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 312585 - All updates in a merge marked as conflicts
Summary: All updates in a merge marked as conflicts
Status: RESOLVED FIXED
Alias: None
Product: Subversive
Classification: Technology
Component: Core (show other bugs)
Version: unspecified   Edit
Hardware: PC Windows XP
: P3 major (vote)
Target Milestone: ---   Edit
Assignee: Igor Burilo CLA
QA Contact:
URL:
Whiteboard:
Keywords:
: 317787 (view as bug list)
Depends on:
Blocks:
 
Reported: 2010-05-12 07:17 EDT by Jesper Skov CLA
Modified: 2010-07-01 03:36 EDT (History)
2 users (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Jesper Skov CLA 2010-05-12 07:17:45 EDT 
Build Identifier: Subversive-incubation-0.7.8.I20100506-1300

If create a branch on my project, make some changes on the trunk, and then merge these to the newly created branch, all updated files are marked as conflicts.

It has been so for a number of weekly releases (sorry, I do not remember when it started).

If I do the merge from the command line and refresh my Eclipse view, updated files look correct (i.e. only files that svn marked as conflicting appear as conflicting in Eclipse).


Reproducible: Always

Steps to Reproduce:
1. Create branch
2. Make changes on trunk
3. Merge changes to branch (using Team->Merge, default settings)
4. All merges changes are marked as conflicting
Comment 1 Igor Burilo CLA 2010-05-14 05:02:08 EDT 
Do you have that resources are marked as conflicted in Synchronize View or also in navigator view, e.g. Package Explorer? Another way to check if resources are conflicted is to call Commit action and check resources status in Commit dialog.
Comment 2 Jesper Skov CLA 2010-05-17 02:21:00 EDT 
The conflicts only appear in Synchronize View.

They appear as regular changes in the Explorer and the commit dialog overview.
Comment 3 Igor Burilo CLA 2010-05-17 03:33:25 EDT 
Thanks.
Comment 4 Jesper Skov CLA 2010-06-10 04:51:44 EDT 
We are now using this workaround:

1) Do the merge in Eclipse using Subversive.
2) Switch to Java (or JEE perspective) and do a Team->Update on the projects.
3) Do a Team->Synchronize on the projects.

Now only real conflicts are marked as such.
Comment 5 Igor Burilo CLA 2010-06-18 06:09:29 EDT 
Fixed.
Comment 6 Igor Burilo CLA 2010-06-24 07:16:38 EDT 
*** Bug 317787 has been marked as a duplicate of this bug. ***
Comment 7 Jörg Thönnes CLA 2010-06-29 09:53:50 EDT 
(In reply to comment #5)
> Fixed.

Is there already a weekly build which contains this fix?

This would greatly help us in merging.

Thanks, Jörg
Comment 8 Igor Burilo CLA 2010-07-01 03:36:45 EDT 
(In reply to comment #7)
> Is there already a weekly build which contains this fix?
Not yet, most likely it will be done next week.