[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
Re: [stp-dev] SVN problems
|
Ok,
I've do something similar ( in my situation i must move from one
repository to eclipse stp )
Now i think i've clear the problem.
Try this procedure, there a little work to do manually but at the end
you'll be able to get all things working.
1) Delete all svn information from you project ( Using your original
plugin tigris ) or otherwise do it manually ( find for .svn resources
and delete it )
2) At that point keep your clean code elesewhere in your disk.
3) Checkout with subversive a clean version of eclipse project.
4) Apply you code updates, to the version you just checked out, from
eclipse ( it will be no difficult, copy your sources on the plugin you
checked out from eclipse )
At this point when you synchronize subversive, is able to know you've
made modification and let you to commit.
I kno there's soemting to manual, but it should work.
Another option for pint 1 is to use tortoise svn "Export" that let you
to export a versioned folder somewhere without copying svn stuff.
Let me know if it works for you.
Antony Miguel ha scritto:
Hi Andrea,
If I follow the share wizard I get the warning dialog I attached to my
previous email about how I either have to overwrite local changes or
check the project into a new location in SVN, neither of which is
possible.
The reason (this time) I had to disconnect is because I was moving
from the tigris SVN plugin to the subversive SVN plugin. I had
changes in my local project but had to delete the tigris SVN
meta-information before I could use the subversive SVN plugin to share
the project.
I don't have to do this often but it does come up sometimes (e.g. when
we move structure in SVN if I don't have everything checked in then I
will likely have to do the same thing).
thanks
Antony
Andrea Zoppello wrote:
Hi,
After you've done a disconnect you could share your project with
"Share Project Wizard" this is the way i manage the
im stuff from our internal scn to eclipse stp svn:
1) Disconnect ( delete svn information )
2) Share Project
3) Follow the wizard
BTW Antony, i don't understand why you need to disconnect your
project once you've checked out???
Once you've the version in the repository you could put your
modification on this version and then synchronize.
But if you've just disconnected best way to do what you want to
achieve is:
1) Keep in a separate folder your code
2) Chekcout project from eclipse svn, and overwrite your modification
( you just saved in other folder in point 1 )
3) Apply to the version you check out from svbn, your modification
4) Check in your modification
Just my 2cents.
Andrea Zoppello
Oisin Hurley ha scritto:
Hi Antony,
Thanks for the instructions - it makes things much clearer.
Try checking out B2J core. Then right-click and select
Team-Disconnect. Now imagine you have changes in that project that
need to be committed. You can't checkout the project from SVN
because your changes will be overwritten and (as far as I can tell)
you can't re-share the project with the STP SVN repository to do a
synchronize.
Once I request a Team->Disconnect, it asks me do I want to
delete all the SVN metadata. When I say yes, it tells me
that I will not be able to reconnect the project - that
I will either have to share it to a new location or delete
the project and check it out again (screenshot attached).
Once the SVN metadata is gone, then there's no way for SVN
to automate getting the changes in, alas :(
I did a bit of further investigation and I think there is
a way to speed things up a bit. There is still some human
involvement required. If you change the name of the project
that was disconnected, then check out the project from
the repo again. Next, select the two projects, right click
and select Compare With -> Each Other -- this compares the
projects structurally, and from that you can then drill
down to the standard file comparison viewer. That viewer
provides the means to manually move changes from file to
file. So the process is basically iterate through the files
that the compare editor has indicated as different, and
manually move the changes from the file that is in the
project that was disconnected, to the file that is in the
project that was checked out. Then you can do a commit on
the new checked out project to get the changes in. It's
not perfect, but it will help bring in the changes that
have been made.
cheers
--oh
----------------------------
IONA Technologies PLC (registered in Ireland)
Registered Number: 171387
Registered Address: The IONA Building, Shelbourne Road, Dublin 4,
Ireland
------------------------------------------------------------------------
------------------------------------------------------------------------
_______________________________________________
stp-dev mailing list
stp-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/stp-dev
_______________________________________________
stp-dev mailing list
stp-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/stp-dev
--
*Andrea Zoppello*
___________________________________________
<www.spagoworld.org>
Spagic Architect
___________________________________________
Architect
Research & Innovation Division
*Engineering Ingegneria Informatica S.p.A.
*
Corso Stati Uniti, 23/C - 35127 Padova - Italy
Phone: +39-049.8692511 Fax:+39-049.8692566
*www.eng.it www.spagoworld.org*