Bug 5323 - Compare does not handle correctly conflicts at same location
Summary: Compare does not handle correctly conflicts at same location
Status: RESOLVED FIXED
Alias: None
Product: Platform
Classification: Eclipse Project
Component: Compare (show other bugs)
Version: 2.1   Edit
Hardware: PC Windows 2000
: P3 enhancement (vote)
Target Milestone: 2.1 RC1   Edit
Assignee: Andre Weinand CLA
QA Contact:
URL:
Whiteboard:
Keywords:
: 12207 23533 (view as bug list)
Depends on:
Blocks:
 
Reported: 2001-10-29 07:47 EST by Philipe Mulet CLA
Modified: 2018-03-29 17:25 EDT (History)
0 users

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 Philipe Mulet CLA 2001-10-29 07:47:21 EST 
Build 205 & 206 (20011025)

When a conflict occurred in between a local resource change and some change 
performed on the server, the compare tool does not allow me to merge changes
if they occurred at the same location. Copying from right to left overrides
the local change.

AAAAAAAAAAAAAAAAA        AAAAAAAAAAAAAAAAA
SOME LOCAL CHANGE <----- SOME SERVER CHANGE
BBBBBBBBBBBBBBBBB        BBBBBBBBBBBBBBBBB
CCCCCCCCCCCCCCCCC        CCCCCCCCCCCCCCCCC
DDDDDDDDDDDDDDDDD        DDDDDDDDDDDDDDDDD

It should not map the server change to the local one, but rather to an empty 
line before/after the local one.
Comment 1 Andre Weinand CLA 2002-04-02 08:11:44 EST 
*** Bug 12207 has been marked as a duplicate of this bug. ***
Comment 2 Andre Weinand CLA 2002-05-31 05:19:34 EDT 
Not for 2.0
Comment 3 Andre Weinand CLA 2003-02-13 06:05:03 EST 
This is on the "hot list" of PRs to address for 2.1 based on input from the 
other teams.
Comment 4 Andre Weinand CLA 2003-02-13 09:31:52 EST 
fixed and released for I20030218
Comment 5 Andre Weinand CLA 2003-02-19 16:39:32 EST 
*** Bug 23533 has been marked as a duplicate of this bug. ***
Comment 6 Philipe Mulet CLA 2003-02-20 05:15:19 EST 
Checked new behavior, it is definitely better than in the past, however in 
following case it is not yet optimal (unclear if optimal is doable):

Starting from file:

CCCCCCCC
DDDDDDDD
EEEEEEEE

I perform a local change to add 2 lines (A and B):

AAAAAAAA
BBBBBBBB
CCCCCCCC
DDDDDDDD
EEEEEEEE

In the meantime, someone did a change on the server file, so as to add 2 lines 
Z and B (note that B is the same on server and my local modified file).

ZZZZZZZZ
BBBBBBBB
CCCCCCCC
DDDDDDDD
EEEEEEEE

when merging, I will end up with twice the D line.

AAAAAAAA
BBBBBBBB
ZZZZZZZZ
BBBBBBBB
CCCCCCCC
DDDDDDDD
EEEEEEEE

Not critical though. This is a scenario which is fairly common when we edit our 
buildnotes file (we always add a leading '<br>' on the last PR url listed 
before we add one new item to the list, thus we all generated an identical B 
line.
Comment 7 Eclipse Genie CLA 2018-03-29 17:25:28 EDT 
GitHub Pull Request 5324 created by [hsudbrock]
https://github.com/eclipse/smarthome/pull/5324