| commit | cec6b8dfed657c7e0979e0a1a5d1e9f811b6769f | |
| author | Philip Langer <planger@eclipsesource.com> | |
| Thu, 23 Apr 2015 17:16:15 +0000 (23 19:16 +0200) | ||
| committer | Laurent Goubet <laurent.goubet@obeo.fr> | |
| Mon, 4 May 2015 15:07:49 +0000 (4 17:07 +0200) | ||
| tree | 676607c068f0d6ce9d5db06ea9096d629f93dc0b | treesnapshot (tar.gz zip) |
| parent | 59d8ebf7915e710732b8d444adfd52c54602210a | commitdiff |
[465331] Delegate file additions and deletions if missed in model merge
During the model merge, we track added and deleted files and check after
the model merge whether deleted or added files according to the Team
diffs have been missed. If file additions or deletions have been missed
during the model merge, we perform those by delegating them to the Team
API.
Bug: 465331
Change-Id: Ifff4dc1c543ff0c3ea86a0014a67182fdb68660e
Signed-off-by: Philip Langer <planger@eclipsesource.com>
During the model merge, we track added and deleted files and check after
the model merge whether deleted or added files according to the Team
diffs have been missed. If file additions or deletions have been missed
during the model merge, we perform those by delegating them to the Team
API.
Bug: 465331
Change-Id: Ifff4dc1c543ff0c3ea86a0014a67182fdb68660e
Signed-off-by: Philip Langer <planger@eclipsesource.com>
| plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/EMFResourceMappingMerger.java | diffblobblamehistory |