Bug 300237 - [Sync View][Apply Patch] Copying changes from right to left results in a conflict
Summary: [Sync View][Apply Patch] Copying changes from right to left results in a conf...
Status: RESOLVED FIXED
Alias: None
Product: Platform
Classification: Eclipse Project
Component: Team (show other bugs)
Version: 3.6   Edit
Hardware: PC All
: P3 normal (vote)
Target Milestone: 3.6 M6   Edit
Assignee: Tomasz Zarna CLA
QA Contact:
URL: http://wiki.eclipse.org/Apply_patch_i...
Whiteboard:
Keywords:
Depends on:
Blocks: 300222
  Show dependency tree
 
Reported: 2010-01-20 13:12 EST by Tomasz Zarna CLA
Modified: 2010-03-01 11:26 EST (History)
0 users

See Also:

Attachments
Fix v01 (14.18 KB, patch)
2010-02-26 11:34 EST, Tomasz Zarna CLA 		no flags Details | Diff
mylyn/context/zip (141.45 KB, application/octet-stream)
2010-02-26 11:34 EST, Tomasz Zarna CLA 		no flags Details
Fix v02 (17.48 KB, patch)
2010-03-01 10:18 EST, Tomasz Zarna CLA 		no flags Details | Diff
Show Obsolete (1) View All 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 Tomasz Zarna CLA 2010-01-20 13:12:26 EST 
When in compare editor, manually copying changes from right to left causes the copied hunk to appear as conflict in the Sync View. This is similar to bug 300213.
Comment 1 Tomasz Zarna CLA 2010-02-16 06:56:55 EST 
We can either disable this kind of interaction with changes and limit it to "Merge" action only. Or figure out which hunk is associated with the change being copied and mark it as merged (applied). The only problem is that a hunk can contain many changes and cannot be considered as applied until all of them are copied, so this may be a little bit tricky.
Comment 2 Tomasz Zarna CLA 2010-02-26 11:34:43 EST 
Created attachment 160329 [details]
Fix v01

Restored "Mark as Merged" action. It should be used to manually mark a file as merged after copying changes via the toolbar action in compare editor. This is an early version of the fix, do not apply.
Comment 3 Tomasz Zarna CLA 2010-02-26 11:34:49 EST 
Created attachment 160330 [details]
mylyn/context/zip
Comment 4 Tomasz Zarna CLA 2010-03-01 10:18:59 EST 
Created attachment 160489 [details]
Fix v02

A polished version of Fix v01. One more thing needs fixing though, you cannot select an individual hunk and mark it as merged. This is a similar issue as bug 300214 and should be addressed there eventually.
Comment 5 Tomasz Zarna CLA 2010-03-01 11:26:21 EST 
Applied to HEAD, available in builds >N20100228-2000. "Mark as Merged" is back!