[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: Ulrich Eckhardt <eckhardt_at_satorlaser.com>
Date: Fri, 3 Sep 2010 09:34:19 +0200

On Friday 03 September 2010, Peter Bailey wrote:
> 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,

Just to avoid a common cause for confusion: The repository is (probably) at
revision 22, and so are both trunk and the branch. These revision numbers
apply to the repository as a whole, not to separate projects.

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

Okay, so you want to merge the changes from trunk into the branch and those
from the branch into the trunk. Effectively, this means that you end up with
identical branch and trunk. For that, you need two merge operations.

Note: it might be easier to just merge the changes from the branch to the
trunk and then recreate the branch from the trunk, but that's up to you.

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

Well, while this surely works, I don't understand why you restrict yourself
like that.

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

As mentioned above, the revision is for the repository, not for the items
within the repository. Also, "update" puts the working copy in the state
resembling the the "HEAD revision", which is the latest in the repository.
You can also specify the revision explicitly. Now, a switch will change the
path inside the repository but also the revision to HEAD, so an update
afterwards doesn't change anything.

I'd suggest you stop with your task for now and instead read the SVN book
instead. In particular it explains what "update" and "merge" actually mean
and how to use them. Your case (merging changes from a branch) is even
explained as an example there.

Good luck!

Uli

-- 
ML: http://tortoisesvn.tigris.org/list_etiquette.html
FAQ: http://tortoisesvn.net/faq
Sator Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
**************************************************************************************
Sator Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
**************************************************************************************
           Visit our website at <http://www.satorlaser.de/>
**************************************************************************************
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte Änderungen enthalten. Sator Laser GmbH ist für diese Folgen nicht verantwortlich.
**************************************************************************************
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2655054
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-09-03 09:34:27 CEST

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