RE: how are local changes processed by a "svn switch"?

So if I create a branch from a trunk, checkout the branch, make some changes
in the working copy, switch the working copy to the trunk, then switch it
back to the branch, I will have a working copy that has been updated with
the trunk changes?

Royce

-----Original Message-----
From: Ben Collins-Sussman [mailto:sussman@collab.net]
Sent: Monday, August 08, 2005 8:43 PM
To: Branko Čibej
Cc: Robert P. J. Day; Subversion mailing list
Subject: Re: how are local changes processed by a "svn switch"?

On Aug 8, 2005, at 7:31 PM, Branko Čibej wrote:
>>
> "svn switch" works just like "svn update", except that updates from
> a different URL (and modifies the working copy metadata
> accordingly). So, any differences between the original branch and
> the new branch will be merged into your local changes.

Yep, as the box in the book explains, 'svn update' and 'svn switch'
are the same codepath. 'update' is just a special case of 'switch',
where the revision changes but not the URL.

When the client does an update or switch,

  * it sends a description of all working revisions to the server

  * the server compares these revisions to a (rev, URL) location and
sends a tree delta

  * the client receives the tree delta, and applies it in a non-
destructive way to the working copy. It's all in libsvn_wc/
update_editor.c.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Aug 9 16:17:36 2005