[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:53:25 CEST

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

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

These are the steps you are suggesting the option should do:

1) Create branch with URL to URL copy
2) Switch to branch
3) Commit to branch
4) Switch back to where you started

The problem is that step 2 is really an update. Unless the WC was
entirely at the revision that was used when creating the branch, the
switch operation will do an update locally. This could include creating
conflicts.

So while doing it this way does solve the problems I posed, it raises some
new ones. Ideally, if this feature were really desired, Subversion would
support it as a command. Then option 1 could be done from the WC (using
the base revisions only). This would avoid the Switch in step 2 causing a
problem.

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:53:49 2005

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