Bug 23533

Summary:

Compare on conflict prevent copying change (from right to left)

Product:

[Eclipse Project] Platform

Reporter:

Philipe Mulet <philippe_mulet>

Component:

Compare

Assignee:

Platform-Compare-Inbox <platform-compare-inbox>

Status:

RESOLVED DUPLICATE

QA Contact:

Severity:

normal

Priority:

Version:

2.0

Target Milestone:

---

Hardware:

OS:

Windows 2000

Whiteboard:

Attachments:

Description	Flags
conflict compare unable to insert server change	none

Description Philipe Mulet

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

2002-09-13 06:48:06 EDT

Created attachment 1986 [details]
conflict compare unable to insert server change

Comment 2 Andre Weinand

2003-02-19 16:39:31 EST


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