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

Re: Problem with Vendor branch upgrading

From: Peter McNab <mcnab_p_at_melbpc.org.au>
Date: 2006-08-04 09:23:39 CEST

Kyohere Luke wrote:
> Hello,
>
> I'm having a few problems with vendor branch upgrading on windows.
>
> I've read the vendor branches documentation, and was able to
> successfully create an initial vendor drop. Now, however, I'm trying
> to upgrade to the latest vendor version.
>
> As per the instructions in the manual, I've checked out the
> /vendor/tool/current directory and the problem is when I try to copy
> the contents of the tool directory over it, it doesn't delete those
> files which should no-longer exist. i.e those files which were removed
> from the latest version. So a tortoiseSVN>Check for modifications will
> show some modified files and some unversioned files, but no deleted
> files. I have to go into the directories manually and find out which
> files need to be deleted, which is tedious to say the least.
>
> I understand that a similar operation on unix/linux would have gotten
> rid of the unwanted files, while windows would just overwrite the
> files that exist and add the new files. Is there a standard way of
> upgrading vendor branches on windows? And is there a standard way of
> doing it with TSVN, which addresses this issue?
>
> Thanks!
>
> Luke
I found the most reliable way has been to use Beyond Compare (BC2) to
compare the current WC and a nonversioned folder containing the new
vendor code.
BC2 is set to ignore the .svn folders.
After doing a full binary comparison BC2 is used to delete files/folders
from the WC that don't exist in the new fileset.
You should then be able to drop the new vendor code into the WC and
making sure the added files are "svn Added" then do your commit.
There will be variations available to you on the above process to suite
the occasion.

And BC2 is a really good tool to have and use.
Just my 2c worth.

Peter

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Fri Aug 4 09:23:50 2006

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