diff options
Diffstat (limited to 'bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs')
4 files changed, 8 insertions, 4 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java index a78efc0d7..4a7362d37 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java @@ -84,7 +84,9 @@ public class CVSMergeSubscriber extends CVSSyncTreeSubscriber implements IResour } protected SyncInfo getSyncInfo(IResource local, IRemoteResource base, IRemoteResource remote) throws TeamException { - return new CVSMergeSyncInfo(local, base, remote, this); + CVSMergeSyncInfo info = new CVSMergeSyncInfo(local, base, remote, this); + info.init(); + return info; } public void merged(IResource[] resources) throws TeamException { diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSyncInfo.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSyncInfo.java index 81b11a7db..2244c73fe 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSyncInfo.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSyncInfo.java @@ -20,7 +20,7 @@ import org.eclipse.team.core.synchronize.*; */ public class CVSMergeSyncInfo extends CVSSyncInfo { - public CVSMergeSyncInfo(IResource local, IRemoteResource base, IRemoteResource remote, Subscriber subscriber) throws TeamException { + public CVSMergeSyncInfo(IResource local, IRemoteResource base, IRemoteResource remote, Subscriber subscriber) { super(local, base, remote, subscriber); } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncInfo.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncInfo.java index e10ac9234..55718890e 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncInfo.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncInfo.java @@ -39,7 +39,7 @@ public class CVSSyncInfo extends SyncInfo { private static final int SYNC_INFO_CONFLICTS = 5; private Subscriber subscriber; - public CVSSyncInfo(IResource local, IRemoteResource base, IRemoteResource remote, Subscriber subscriber) throws TeamException { + public CVSSyncInfo(IResource local, IRemoteResource base, IRemoteResource remote, Subscriber subscriber) { super(local, base, remote, ((SyncTreeSubscriber)subscriber).getResourceComparator()); this.subscriber = subscriber; } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncTreeSubscriber.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncTreeSubscriber.java index 13d61048a..dedbd4bc6 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncTreeSubscriber.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncTreeSubscriber.java @@ -92,7 +92,9 @@ public abstract class CVSSyncTreeSubscriber extends SyncTreeSubscriber { * @return */ protected SyncInfo getSyncInfo(IResource local, IRemoteResource base, IRemoteResource remote) throws TeamException { - return new CVSSyncInfo(local, base, remote, this); + CVSSyncInfo info = new CVSSyncInfo(local, base, remote, this); + info.init(); + return info; } /* (non-Javadoc) |