[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: Nathan Kidd <nathan-svn_at_spicycrypto.ca>
Date: 2005-08-03 17:48:54 CEST

Mark Phippard wrote:
> Nathan Kidd <nathan-svn@spicycrypto.ca> wrote on 08/03/2005 11:29:48 AM:
>>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.
>
> 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).

If you create the branch with a copy from a URL I don't think this will
be an issue, right? Just look at the base revision of your wc, then copy
the trunk at that revision to create the branch. This whole operation
wouldn't let you preserve mixed revision working copies (the switch back
to trunk would update everything to HEAD) but maybe resetting your wc to
look like HEAD is what you want in this situation anyway -- because you
want to work on something else and commit it.

-Nathan

---------------------------------------------------------------------
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:48:59 2005

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