Discussions  >  Issues  >  [artf77] New Change-set merge client not working on CSFE5.0 VMWare Image

Back to topic list

[artf77] New Change-set merge client not working on CSFE5.0 VMWare Image

Author selsemore (OCN Member)
Full name Stephen Elsemore
Date 2008-10-23 08:13:46 PDT
Message Project: desktop-eclipse
Type: Issue
Artifact ID: artf77 (Change-set merge client not working on CSFE5.0 VMWare Image)
URL: http://desktop-eclip​se.open.collab.net/s​ervlets/tracking/id/​artf77

Modified by: Stephen Elsemore (selsemore) XXXX@XXXX
The following modifications were made to this artifact:


====================​====================​====================​====================​
Activity | Old value | New value
====================​====================​====================​====================​
Artifact created | |
--------------------​--------------------​--------------------​--------------------​
New value added to attribute Ass | | selsemore
igned to | |
--------------------​--------------------​--------------------​--------------------​
Summary set to new value | | Change-set merge client not worki
                                 | | ng on CSFE5.0 VMWare Image
--------------------​--------------------​--------------------​--------------------​
Issue type set to new value | | Defect
--------------------​--------------------​--------------------​--------------------​
Component set to new value | | SFEE
--------------------​--------------------​--------------------​--------------------​
Priority set to new value | | P2
--------------------​--------------------​--------------------​--------------------​
Status set to new value | | Submitted
--------------------​--------------------​--------------------​--------------------​
 
Description set to new value
*************
* New value *
*************
Artifact has several associated commits to a branch. When trying to merge that branch using the change set merge client, the revisions for these commits are not showing up.

The problem is that the change set merge client needs to get the SVN URL and revision for the items
that have been changed for an artifact. For CSFE, there is a problem here in that the SOAP API does not
provide any way to get this information. The closest we are able to come is that we can access the SCM
Viewer URL. This is typically on the same server as the SCM server so we are able to use its URL to
construct an SVN URL. For example on sf5latest here are the values:

Repository Base URL: http://sf5latest.col​lab.net/svn/repos
SCM Viewer URL: http://sf5latest.col​lab.net/integration/​viewcvs/viewcvs.cgi

At runtime, we find "integration" in the SCM viewer URL and then parse out the base URL:

http://sf5latest.collab.net

Using that, we can construct the SVN URL (this is far from perfect).

We have this same "problem" in the CollabNet Sites view. When you expand a CSFE project we allow you to
expand the SVN repositories. To do this we need to know the URL's and the SOAP API does not provide
them. To workaround this, the Sites view uses a different heuristic. It starts by assuming the SVN server
is on the same physical server as CSFE. But you can override this to a user-specified value at the site,
project and repository levels.

Perhaps the merge client could be modified to get the URL from the Sites view? This would allow it to
piggy-back on its heuristic which should be more "fool-proof" since the user can override it. Of course in
theory someone can use the merge client without ever creating a site in the Sites view. I am not sure how
we overcome that.
--------------------​--------------------​--------------------​--------------------​

 

--------------------​--------------------​--------------------​--------------------​
This message was automatically generated by Project Tracker.

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

[artf77] New Change-set merge client not working on CSFE5.0 VMWare Image selsemore (OCN Member) Stephen Elsemore 2008-10-23 08:13:46 PDT
Messages per page: