[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 22:44:35 CEST

news <news@sea.gmane.org> wrote on 08/03/2005 04:14:50 PM:

> Nathan Kidd <nathan-svn <at> spicycrypto.ca> writes:
>
> > So you pretty-well need to
> > copy from your WC to URL, and then revert.
>
> If you do this, is the problem with comparing before and after in TMerge
an
> intrinsic SVN issue, or something specific to TSVN??
>
> I notice that, while double-clicking on the log fails to find the file
(before
> the copy), blame works fine.

The best way to do this is to just do it in multiple steps, so that you
can deal with any conflicts that might arise:

1. Optional (run svn update to get your entire project on HEAD). Deal
with conflicts.
2. Create the branch from your WC but using thea URL to URL copy option.
3. Switch to the branch. If you skipped step 1, then you may get updates
and conflicts in this step.
4. Commit to the branch.

That creates your shelf, and since the changes are now in a second
revision, they are easy to merge. Typically, you would now use switch to
move back to where you were. The nice thing with this technique, is that
new files that were added to the shelf will be deleted by the switch and
you will have a working copy that mirrors your trunk.

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 22:44:58 2005

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