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

Re: [TSVN] Re: Shelving

From: Mark Phippard <MarkP_at_softlanding.com>
Date: 2005-08-03 17:33:50 CEST

Nathan Kidd <nathan-svn@spicycrypto.ca> wrote on 08/03/2005 11:29:48 AM:

> As you pointed out, Mark, yes you can do a simple 'svn copy wc
> mybranch', but this does create the problems you listed in 2) and 3)
> above. If you switch and then commit all your changes into your branch,

> then when you switch back to trunk those changes are automatically
> removed (your wc will be made to match trunk). By having the copy as a
> separate commit you then have two merge points on your branch, rather
> than, as you say in 3), having to merge differences between the trunk
> (at the correct rev num) and your branch, back to the trunk.
>
> If such an operation were streamlined into one button then it wouldn't
> really matter if it is two operations or four.

Agreed. However, I think there are still some complications. Namely the
initial branch creation might not match the working copy base exactly, so
the next action, the switch, could result in updates (and conflicts).

Mark

_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Aug 3 17:34:17 2005

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