[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:29:48 CEST

Mark Phippard wrote:
> The only real problems in this scenario are:
>
> 1) It is at least 2 steps.
>
> 2) If new files were created, then Revert has to be manually cleaned up
> to remove the new files.
>
> 3) Maybe I do not use this feature as much as I think, because as I write
> this, it seems like the merge would be kind of difficult to do. Since the
> shelf was created in one transaction that created the branch and committed
> the change, you cannot use the simple use-case of just merging the changes
> that occurred on the branch. It seems like that would give a problem due
> to the branch creation. So I think you would have to do a merge where you
> compared the branch with trunk at the revision the branch was created.

I'm the "someone" on the users@svn list originally suggesting 'svn copy
trunkurl mybranch', 'svn switch wc mybranch', 'svn commit', 'svn switch
trunk'.

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.

-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:30:08 2005

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