Update Working Copy With Changes From Others

Hi all

I am relatively new to TSVN and I am lost, very lost!

I have a project with
    trunk @ Rev 22, and
    branch @ Rev 13
The branch contains source code for a major change, while the trunk has
been used for on-going changes to the production version of the program,

I now want to merge these two sets of files, (treating this as updating
with changes from others).

I have only one folder as the working copy and I switch this folder
between the trunk and the branch, as appropriate.

As I understand the information in the help file, I should
    have the working copy switched to the branch,
    select the working copy folder,
    right click on the WC folder,
    select "SVN Update" from the pop-up menu

Unfortunately, this does nothing ... meaning that the files in the WC
folder are not updated to Rev 22 from the trunk. However, the dialogue
form shows "Completed At revision: 22"

Where am I going wrong?

Peter

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2654960

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-09-03 07:53:38 CEST