diff options
| author | Michael Valenta | 2004-02-17 16:20:42 +0000 |
|---|---|---|
| committer | Michael Valenta | 2004-02-17 16:20:42 +0000 |
| commit | 6b6daa602acedc73bc78cc7346c55dfeaf172cb1 (patch) | |
| tree | 8f1a1c1d18e9cb0486aec9c970237ce3da9a2261 /bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java | |
| parent | 99efd20c0e1eb47500401dfb736c065a241e267d (diff) | |
| download | eclipse.platform.team-6b6daa602acedc73bc78cc7346c55dfeaf172cb1.tar.gz eclipse.platform.team-6b6daa602acedc73bc78cc7346c55dfeaf172cb1.tar.xz eclipse.platform.team-6b6daa602acedc73bc78cc7346c55dfeaf172cb1.zip | |
*** empty log message ***
Diffstat (limited to 'bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java')
| -rw-r--r-- | bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java | 4 |
1 files changed, 3 insertions, 1 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 { |