Eclipse Community Forums: Subversive

Home » Eclipse Projects » Subversive » Can't merge

Wed, 16 April 2008 21:07

Eclipse User

Just tried to "merge" a project with another branch, but got this error:

Merge status operation failed.
svn: Requested SVNAdmin functionality is not yet implemented

Does this look like a problem with Subversive, SVN Kit, or the svn
repository?

Re: Can't merge [message #16415 is a reply to message #16106]

Wed, 16 April 2008 23:12

Eclipse User

If I switch from SVN Kit 1.2 to JavaHL 1.5.0 I don't get this error, but a
"no changes in merge" message (even though there are changes for sure)...

Re: Can't merge [message #16451 is a reply to message #16415]

Thu, 17 April 2008 04:50

Eclipse User

Originally posted by: alexander.gurov.polarion.org

Hello Eric,

Could you please specify what versions of Subversive and SVN connectors
are installed in your Eclipse IDE instance?

As I see from the code of SVN Kit 1.2.0 which is used in latest available
build it should not throw exceptions like:

svn: Requested SVNAdmin functionality is not yet implemented

Also we found issue in merge, if property in conflict: in that case
resource does not recognized as changed. So, fix for the last problem
which I describes will be available in the next Subversive build
(approximately at the end of next week).

P.S.
As temporary workaround you can use merge without UI extensions. In order
to disable UI please switch off option at:
Window->Preferences->Team->SVN->SVN Connector->Use SVN Merge view

Re: Can't merge [message #16569 is a reply to message #16451]

Thu, 17 April 2008 22:58

Eclipse User

Alexander Gurov wrote:
> Could you please specify what versions of Subversive and SVN connectors
> are installed in your Eclipse IDE instance?

Subversive 0.7.0
SVN Kit 1.2.0 alpha
JavaHL1.5.0 alpha2

> As I see from the code of SVN Kit 1.2.0 which is used in latest available
> build it should not throw exceptions like:

> svn: Requested SVNAdmin functionality is not yet implemented

> Also we found issue in merge, if property in conflict: in that case
> resource does not recognized as changed. So, fix for the last problem
> which I describes will be available in the next Subversive build
> (approximately at the end of next week).

Great!

> P.S.
> As temporary workaround you can use merge without UI extensions. In order
> to disable UI please switch off option at:
> Window->Preferences->Team->SVN->SVN Connector->Use SVN Merge view

Re: Can't merge [message #16619 is a reply to message #16569]

Fri, 18 April 2008 09:10

Eclipse User

Originally posted by: alexander.gurov.polarion.org

Eric Jain wrote:

> Subversive 0.7.0
> SVN Kit 1.2.0 alpha
> JavaHL1.5.0 alpha2

Yes, definitely your Subversive instance needs to be updated. I think the
best time to do this is the moment of next Subversive build publishing,
regarding to merge-related fixes.

Previous Topic:	svn copy
Next Topic:	Subversive & merges

Goto Forum:

-=] Back to Top [=-

Current Time: Thu Jul 17 16:20:11 EDT 2025

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter