Summary: | Compare does not handle correctly conflicts at same location | ||
---|---|---|---|
Product: | [Eclipse Project] Platform | Reporter: | Philipe Mulet <philippe_mulet> |
Component: | Compare | Assignee: | Andre Weinand <andre_weinand> |
Status: | RESOLVED FIXED | QA Contact: | |
Severity: | enhancement | ||
Priority: | P3 | ||
Version: | 2.1 | ||
Target Milestone: | 2.1 RC1 | ||
Hardware: | PC | ||
OS: | Windows 2000 | ||
See Also: | https://github.com/eclipse/smarthome/pull/5324 | ||
Whiteboard: |
Description
Philipe Mulet
2001-10-29 07:47:21 EST
*** Bug 12207 has been marked as a duplicate of this bug. *** Not for 2.0 This is on the "hot list" of PRs to address for 2.1 based on input from the other teams. fixed and released for I20030218 *** Bug 23533 has been marked as a duplicate of this bug. *** 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. GitHub Pull Request 5324 created by [hsudbrock] https://github.com/eclipse/smarthome/pull/5324 |