Bug 23533 - Compare on conflict prevent copying change (from right to left)
Summary: Compare on conflict prevent copying change (from right to left)
Status: RESOLVED DUPLICATE of bug 5323
Alias: None
Product: Platform
Classification: Eclipse Project
Component: Compare (show other bugs)
Version: 2.0   Edit
Hardware: PC Windows 2000
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Platform-Compare-Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2002-09-13 06:40 EDT by Philipe Mulet CLA
Modified: 2003-02-19 16:39 EST (History)
0 users

See Also:

Attachments
conflict compare unable to insert server change (223.46 KB, image/jpeg)
2002-09-13 06:48 EDT, Philipe Mulet CLA 		no flags Details
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 Philipe Mulet CLA 2002-09-13 06:40:56 EDT 
R2.0

If file has local change in same place as server file, then a conflict is 
correctly shown. But compare is unable to incorporate the server change, since
it overrides the local one.

See attached example.
Comment 1 Philipe Mulet CLA 2002-09-13 06:48:06 EDT 
Created attachment 1986 [details]
conflict compare unable to insert server change
Comment 2 Andre Weinand CLA 2003-02-19 16:39:31 EST 

*** This bug has been marked as a duplicate of 5323 ***