On 19.03.2015 19:26, Scott wrote:
> We have a government code which we modify to get its output in our
> format. It is in a directory under a larger project that is under SVN
> control. We received a new version of that code. Looking back, I
> should have probably merged our changes into that new code with SVN,
> but being somewhat new to SVN I did not. So now I have ~400 files
> from the new version that I want to copy over the ~400 files from the
> old version. The problem is that there are 20 files that were deleted
> from the old version and 20 new files. I was thinking of just copying
> the new files in. The files in that directory that I don't see an SVN
> icon I will add in svn. I then could use something like winmerge to
> find the files that are in the old version, but not the new version
> and delete in SVN. Is there a better way?
Right-drag the folder with the new files over the folder that's under
svn control. When you release the right mouse button, a context menu
appears and one of the entries shown there is named "SVN vendorbranch
here". Click on that.
TortoiseSVN will then copy over all the files, remove the files that are
not in the new version anymore and 'svn add' all the new files.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest interface to (Sub)version control
/_/ \_\ http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3106684
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-03-19 20:16:22 CET