Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 305217
Collapse All | Expand All

(-)src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSubscriber.java (+11 lines)
Lines 49-54 Link Here
49 
					if (patcher.isManuallyMerged((Hunk) hunks[i]))
 49 
					if (patcher.isManuallyMerged((Hunk) hunks[i]))
50 
						return IN_SYNC;
 50 
						return IN_SYNC;
51 
				}
 51 
				}
52 
			} else {
53 
				// deletions don't have the remote variant, but still can be manually merged
54 
				Object patchObject = PatchModelProvider.getPatchObject(getLocal(), patcher);
55 
				if (patchObject instanceof FilePatch2) {
56 
					FilePatch2 filePatch2 = (FilePatch2) patchObject;
57 
					IHunk[] hunks = filePatch2.getHunks();
58 
					for (int i = 0; i < hunks.length; i++) {
59 
						if (patcher.isManuallyMerged((Hunk) hunks[i]))
60 
							return IN_SYNC;
61 
					}
62 
				}
52 
			}
 63 
			}
53 
			int kind = super.calculateKind();
 64 
			int kind = super.calculateKind();
54 
			// mark diffs with problems as conflicts
65 
			// mark diffs with problems as conflicts

Return to bug 305217