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

Re: [Subclipse-users] Bug in Subclipse Merge when project is not at default location

From: Mark Phippard <markphip_at_gmail.com>
Date: Tue, 22 Dec 2009 16:35:19 -0500

2009/12/22 Alain Désilets <alain.desilets_at_nrc-cnrc.gc.ca>:
> I have a project called tiki-trunk, which is not located in the default
> workspace location. It’s located in:
>    C:\wamp\www\tiki-trunk
> As shown in the attached screenshot project_path.png (obtained by right
> clicking on the project, and clicking on Properties).
> If I right click on the tiki-trunk project and click on Team > Merge, I get
> the attached merge_screen.png screenshot.
> As you can see, Subclipse expects to merge the results into a project that
> is located in the default workshpace location:
>    C:/Documents and Settings/desiletsa/eclipse_workspace.

I wouldn't necessarily be concerned with that. At least not until you
perform a merge that appears to be writing to the wrong location. It
could just be a dialog glitch. I have always used a working copy
outside the workspace and never had problems.

That said, for the past couple years the CollabNet Merge Client has
been available which provides a better GUI for performing merges and I
have used it exclusively in that time. This should be available on
the Subclipse 1.6.x update site and I would recommend using it.

> If I click on the Select button that is on the right of the workspace path,
> I get the screenshot select_button.png, which doesn’t seem to have anything
> to do with selecting the path of the project.

Screenshot does not mean anything to me since I do not know your
project. It should be allowing you to select revisions based on the
URL you have in the top-field of the dialog. Which, based on your
first screenshot, seems kind of non-sensical given that it is pointing
to a specific file in the repository as opposed to a branch or trunk.

You should be able to use the command line or TortoiseSVN or any other
client. Just make sure it is the same SVN client version because each
version of SVN has a different client working copy format. If you are
using Subclipse 1.6.x you should be using an SVN 1.6 client.



Mark Phippard
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2009-12-22 22:35:27 CET

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