[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[Subclipse-users] how do I use new svn 1.5 merging features with Subclipse?

From: Ian Clarke <ian.clarke_at_gmail.com>
Date: Sat, 26 Jul 2008 12:38:16 -0500

I'm trying to figure out how to use the new subversion merge tracking
with Subclipse. I'm running Subclipse 1.4.1.

I get the impression that you can only use this if you install the
CollabNet Eclipse plugin - is this true? I've tried to install this,
but I wind up running into dependency hell every time I do (see
below).

Can I use merge-tracking with vanilla Subclipse?

If not, is there a good explanation of how to get the CollabNet
Eclipse plugin installed? Every time I try I get the following
dependency problems, which I have no clue how to resolve:

Cannot complete the request. See the details.
Mylyn Bridge: PDE, CVS and Ant will be ignored because a newer version
is already installed.
Mylyn Bridge: Java Development will be ignored because a newer version
is already installed.
Mylyn Bridge: Eclipse IDE will be ignored because a newer version is
already installed.
Mylyn Task List (Required) will be ignored because a newer version is
already installed.
Mylyn Connector: Bugzilla will be ignored because a newer version is
already installed.
Mylyn Focused UI (Recommended) will be ignored because a newer version
is already installed.
Subclipse Integration for Mylyn 2.x (Optional) will be ignored because
a newer version is already installed.
Cannot find a solution where both Match[requiredCapability:
org.eclipse.equinox.p2.iu/org.eclipse.mylyn.tasks.ui/[3.0.1.v20080721-2100-e3x,3.0.1.v20080721-2100-e3x]]
and Match[requiredCapability:
org.eclipse.equinox.p2.iu/org.eclipse.mylyn.tasks.ui/[2.0.0,3.0.0)]
can be satisfied.
Cannot find a solution where both Match[requiredCapability:
org.eclipse.equinox.p2.iu/org.eclipse.mylyn.monitor.core/[3.0.1.v20080721-2100-e3x,3.0.1.v20080721-2100-e3x]]
and Match[requiredCapability:
org.eclipse.equinox.p2.iu/org.eclipse.mylyn.monitor.core/[2.0.0,3.0.0)]
can be satisfied.
Cannot find a solution where both Match[requiredCapability:
org.eclipse.equinox.p2.iu/org.eclipse.mylyn.tasks.core/[3.0.1.v20080721-2100-e3x,3.0.1.v20080721-2100-e3x]]
and Match[requiredCapability:
org.eclipse.equinox.p2.iu/org.eclipse.mylyn.tasks.core/[2.0.0,3.0.0)]
can be satisfied.
Cannot find a solution where both Match[requiredCapability:
org.eclipse.equinox.p2.iu/org.eclipse.mylyn.tasks.ui/[3.0.1.v20080721-2100-e3x,3.0.1.v20080721-2100-e3x]]
and Match[requiredCapability:
org.eclipse.equinox.p2.iu/org.eclipse.mylyn.tasks.ui/[2.0.0,3.0.0)]
can be satisfied.
Cannot find a solution where both Match[requiredCapability:
org.eclipse.equinox.p2.iu/org.eclipse.mylyn.tasks.core/[3.0.1.v20080721-2100-e3x,3.0.1.v20080721-2100-e3x]]
and Match[requiredCapability:
org.eclipse.equinox.p2.iu/org.eclipse.mylyn.tasks.core/[2.0.0,3.0.0)]
can be satisfied.
Cannot find a solution where both Match[requiredCapability:
org.eclipse.equinox.p2.iu/org.eclipse.mylyn.monitor.core/[3.0.1.v20080721-2100-e3x,3.0.1.v20080721-2100-e3x]]
and Match[requiredCapability:
org.eclipse.equinox.p2.iu/org.eclipse.mylyn.monitor.core/[2.0.0,3.0.0)]
can be satisfied.
Unsatisfied dependency: [org.eclipse.mylyn.ide.ui
3.0.1.v20080721-2100-e33] requiredCapability:
osgi.bundle/org.eclipse.ui.ide/[3.3.0,3.4.0)
Cannot find a solution where both Match[requiredCapability:
osgi.bundle/org.eclipse.ui.ide/[3.4.0,4.0.0)] and
Match[requiredCapability:
osgi.bundle/org.eclipse.ui.ide/[3.3.0,3.4.0)] can be satisfied.
Cannot find a solution where both Match[requiredCapability:
org.eclipse.equinox.p2.iu/org.eclipse.mylyn.tasks.ui/[3.0.1.v20080721-2100-e3x,3.0.1.v20080721-2100-e3x]]
and Match[requiredCapability:
org.eclipse.equinox.p2.iu/org.eclipse.mylyn.tasks.ui/[2.0.0,3.0.0)]
can be satisfied.
Cannot find a solution where both Match[requiredCapability:
org.eclipse.equinox.p2.iu/org.eclipse.mylyn.tasks.core/[3.0.1.v20080721-2100-e3x,3.0.1.v20080721-2100-e3x]]
and Match[requiredCapability:
org.eclipse.equinox.p2.iu/org.eclipse.mylyn.tasks.core/[2.0.0,3.0.0)]
can be satisfied.
Cannot find a solution where both Match[requiredCapability:
org.eclipse.equinox.p2.iu/org.eclipse.mylyn.monitor.core/[3.0.1.v20080721-2100-e3x,3.0.1.v20080721-2100-e3x]]
and Match[requiredCapability:
org.eclipse.equinox.p2.iu/org.eclipse.mylyn.monitor.core/[2.0.0,3.0.0)]
can be satisfied.
Cannot find a solution where both Match[requiredCapability:
osgi.bundle/org.eclipse.ui.ide/[3.4.0,4.0.0)] and
Match[requiredCapability:
osgi.bundle/org.eclipse.ui.ide/[3.3.0,3.4.0)] can be satisfied.
Cannot find a solution where both Match[requiredCapability:
org.eclipse.equinox.p2.iu/org.eclipse.mylyn.tasks.ui/[3.0.1.v20080721-2100-e3x,3.0.1.v20080721-2100-e3x]]
and Match[requiredCapability:
org.eclipse.equinox.p2.iu/org.eclipse.mylyn.tasks.ui/[2.0.0,3.0.0)]
can be satisfied.
Cannot find a solution where both Match[requiredCapability:
org.eclipse.equinox.p2.iu/org.eclipse.mylyn.tasks.core/[3.0.1.v20080721-2100-e3x,3.0.1.v20080721-2100-e3x]]
and Match[requiredCapability:
org.eclipse.equinox.p2.iu/org.eclipse.mylyn.tasks.core/[2.0.0,3.0.0)]
can be satisfied.
Cannot find a solution where both Match[requiredCapability:
org.eclipse.equinox.p2.iu/org.eclipse.mylyn.monitor.core/[3.0.1.v20080721-2100-e3x,3.0.1.v20080721-2100-e3x]]
and Match[requiredCapability:
org.eclipse.equinox.p2.iu/org.eclipse.mylyn.monitor.core/[2.0.0,3.0.0)]
can be satisfied.
Cannot find a solution where both Match[requiredCapability:
osgi.bundle/org.eclipse.ui.ide/[3.4.0,4.0.0)] and
Match[requiredCapability:
osgi.bundle/org.eclipse.ui.ide/[3.3.0,3.4.0)] can be satisfied.
Cannot find a solution where both Match[requiredCapability:
org.eclipse.equinox.p2.iu/org.eclipse.mylyn.tasks.ui/[3.0.1.v20080721-2100-e3x,3.0.1.v20080721-2100-e3x]]
and Match[requiredCapability:
org.eclipse.equinox.p2.iu/org.eclipse.mylyn.tasks.ui/[2.0.0,3.0.0)]
can be satisfied.
Cannot find a solution where both Match[requiredCapability:
org.eclipse.equinox.p2.iu/org.eclipse.mylyn.tasks.core/[3.0.1.v20080721-2100-e3x,3.0.1.v20080721-2100-e3x]]
and Match[requiredCapability:
org.eclipse.equinox.p2.iu/org.eclipse.mylyn.tasks.core/[2.0.0,3.0.0)]
can be satisfied.
Cannot find a solution where both Match[requiredCapability:
org.eclipse.equinox.p2.iu/org.eclipse.mylyn.monitor.core/[3.0.1.v20080721-2100-e3x,3.0.1.v20080721-2100-e3x]]
and Match[requiredCapability:
org.eclipse.equinox.p2.iu/org.eclipse.mylyn.monitor.core/[2.0.0,3.0.0)]
can be satisfied.
Unsatisfied dependency: [org.eclipse.mylyn.ide.ui
3.0.1.v20080721-2100-e33] requiredCapability:
osgi.bundle/org.eclipse.ui.ide/[3.3.0,3.4.0)

Thanks,

Ian.

-- 
Email: ian_at_uprizer.com
Cell: +1 512 422 3588
Skype: sanity
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subclipse.tigris.org
For additional commands, e-mail: users-help_at_subclipse.tigris.org
Received on 2008-07-26 19:38:28 CEST

This is an archived mail posted to the Subclipse Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.