Re: [stp-dev] SVN problems

[Antony Miguel <antony@xxxxxxxxxxxxx>]

Hi Oisin,

Thanks for taking the time to look into this.  Generally speaking the 
main thing from my point of view is not having to remember all the 
modified files and manually update the files in the new project.

Doing the Compare With->Each Other on the projects is a good idea and I 
think that will be fine.  I don't anticipate merging like this often but 
I find it to be necessary occasionally (like just now) and without some 
form of help from Eclipse it has the potential to be a huge pain.

cheers though

Antony

Oisin Hurley wrote:
> 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
>