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

RE: Update Working Copy With Changes From Others

From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Fri, 3 Sep 2010 11:26:01 -0400

> 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?

The steps above are just the beginning of a merge. You have to keep going. Here are the meta steps

1. Merge from trunk
2. Commit the merge
3. Switch to trunk
4. Update
5. Merge from branch choosing "Reintegrate".
6. Commit the merge
7. Delete the branch in the repo browser.

BOb

BOb

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-09-03 17:26:10 CEST

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