Attachment 161594 Details for Bug 305217 – Fix v01

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fix v01

clipboard.txt (text/plain), 1.27 KB, created by Tomasz Zarna

on 2010-03-10 06:31:37 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Tomasz Zarna

Created: 2010-03-10 06:31:37 EST

Size: 1.27 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.team.ui
>Index: src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSubscriber.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSubscriber.java,v
>retrieving revision 1.5
>diff -u -r1.5 ApplyPatchSubscriber.java
>--- src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSubscriber.java	9 Mar 2010 17:39:31 -0000	1.5
>+++ src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSubscriber.java	10 Mar 2010 11:30:14 -0000
>@@ -49,6 +49,17 @@
> 					if (patcher.isManuallyMerged((Hunk) hunks[i]))
> 						return IN_SYNC;
> 				}
>+			} else {
>+				// deletions don't have the remote variant, but still can be manually merged
>+				Object patchObject = PatchModelProvider.getPatchObject(getLocal(), patcher);
>+				if (patchObject instanceof FilePatch2) {
>+					FilePatch2 filePatch2 = (FilePatch2) patchObject;
>+					IHunk[] hunks = filePatch2.getHunks();
>+					for (int i = 0; i < hunks.length; i++) {
>+						if (patcher.isManuallyMerged((Hunk) hunks[i]))
>+							return IN_SYNC;
>+					}
>+				}
> 			}
> 			int kind = super.calculateKind();
> 			// mark diffs with problems as conflicts

Actions: View | Diff

Attachments on bug 305217: 161594 | 161595