Attachment 175034 Details for Bug 44438 – Patch to fix synchronization of locked revision

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

[patch] Patch to fix synchronization of locked revision

patch (text/plain), 1.38 KB, created by Olexiy Buyanskyy

on 2010-07-22 22:03:54 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olexiy Buyanskyy

Created: 2010-07-22 22:03:54 EDT

Size: 1.38 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.team.cvs.core
>Index: src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java,v
>retrieving revision 1.53
>diff -u -r1.53 ResourceSyncInfo.java
>--- src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java	24 May 2010 13:43:32 -0000	1.53
>+++ src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java	23 Jul 2010 01:51:27 -0000
>@@ -346,18 +346,22 @@
> 	 * @param version the version to set
> 	 */
> 	protected void setRevision(String revision) {
>+		isDeleted = false;
> 		if(revision==null || revision.equals(ADDED_REVISION)) {
> 			this.revision = ADDED_REVISION;
> 			timeStamp = null;
> 			syncType = TYPE_REGULAR;
>-			isDeleted = false;
>-		} else if(revision.startsWith(DELETED_PREFIX)) {
>-			this.revision = revision.substring(DELETED_PREFIX.length());
>+			return;
>+		}
>+		if(revision.startsWith(DELETED_PREFIX)) {
>+			revision = revision.substring(DELETED_PREFIX.length());
> 			isDeleted = true;
>-		} else {
>-			this.revision = revision;
>-			isDeleted = false;
> 		}
>+		int lockedIdx = revision.indexOf(LOCKEDBY_SUFFIX);
>+		if (lockedIdx >= 0) {
>+			revision = revision.substring(0, lockedIdx);
>+		}
>+		this.revision = revision;
> 	}
> 	
> 	/**

Actions: View | Diff

Attachments on bug 44438: 175034 | 175035