diff options
| author | Simon Delisle | 2016-04-12 17:59:17 +0000 |
|---|---|---|
| committer | Laurent Delaigue | 2016-05-09 13:57:41 +0000 |
| commit | 8344f7e9b12787d6d3b2dc34f56cff0a41a1ab6d (patch) | |
| tree | 9df16d3a68f6887333f5b8e0caafb3e84a5000de /plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare | |
| parent | 851f823d7d66c3d6bcd22f88430e9db4da94a3a1 (diff) | |
| download | org.eclipse.emf.compare-8344f7e9b12787d6d3b2dc34f56cff0a41a1ab6d.tar.gz org.eclipse.emf.compare-8344f7e9b12787d6d3b2dc34f56cff0a41a1ab6d.tar.xz org.eclipse.emf.compare-8344f7e9b12787d6d3b2dc34f56cff0a41a1ab6d.zip | |
[488089] Fix random position of diagrams after merge
In a three way merge, sometime when you merge resource attachment
changes of kind "move" the operation doesn't give the result you would
expect. In fact, in the resulting merged file, the order of the elements
is not respected. The order depends only in which order you merge the
change instead of using the initial position in the file.
Bug: 488089
Change-Id: I0b1ebac101f845d118cedc0341017c256d35b6ac
Also-by: Philip Langer <planger@eclipsesource.com>
Signed-off-by: Simon Delisle <simon.delisle@ericsson.com>
Signed-off-by: Philip Langer <planger@eclipsesource.com>
Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
Diffstat (limited to 'plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare')
0 files changed, 0 insertions, 0 deletions