| commit | 858cf201d263ecdf997da3a468e4456e579bab63 | |
| author | Laurent Delaigue <laurent.delaigue@obeo.fr> | |
| Mon, 18 May 2015 12:10:16 +0000 (18 14:10 +0200) | ||
| committer | Laurent Delaigue <laurent.delaigue@obeo.fr> | |
| Mon, 18 May 2015 12:10:16 +0000 (18 14:10 +0200) | ||
| tree | 6082a48e634c785beb15a4d9a042c9a727dbad64 | treesnapshot (tar.gz zip) |
| parent | fa7980b6cf4c58aa39cf3cb5a6f6fb9da89f2051 | commitdiff |
[462938] Prevent infinite loop during merge.
Local and remote URIs are different so the test used to stop resolving
remote resource was broken. Local URIs start with "platform:/resource"
whereas remote URIs for new resources don't.
Bug: 462938
Change-Id: I8262187c0898a5c4b5c3aa663ad9ebde1035b845
Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
Local and remote URIs are different so the test used to stop resolving
remote resource was broken. Local URIs start with "platform:/resource"
whereas remote URIs for new resources don't.
Bug: 462938
Change-Id: I8262187c0898a5c4b5c3aa663ad9ebde1035b845
Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
| plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ModelsResolution.java | diffblobblamehistory |