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

Re: Rolling revisions forwards and backwards, very stuck!

From: Dave Lawrence <dlawrence_at_ad-holdings.co.uk>
Date: Tue, 22 Apr 2008 18:50:17 +0100

Pete Hurst wrote:
> So, I'm now using "Update to revision" to roll backwards and forwards
> from a clean working copy, and this is acheiving what I need.
This is definately the best option to use for doing a binary search IMO.

> Still, what does the "Update item to revision" option do?

The difference between "update to revision" and "revert to revision" is
that "update" modifies both working copy (the file you edit) and working
base (the hidden reference copy), whereas "revert" just modifies working
copy by means of reverse merge.

So if your w/c is at r200, and you "revert" to r100, all the changes
between r200 and r100 are "backed out", and this change shows up as
local modificaitons. You could commit this reversion if you wanted.
However, assuming you don't, and you then select revert to r150,
Subversion doesn't know that you've already gone back to r100, as your
working base is still r200, so it will try to perform an r200-r150
reverse merge on top of your already modified files.

If you use "update" to go back to r100, then you'll notice that this
doesn't cause modifications to appear as local. This is because both
your working base and your working copy match. However, you won't be
able to commit files from here that have become "out of date" by means
of the rollback.

Possilby "revert to revision" isn't a totally intuitive name, but it
does come with a big fat warning that it's about to perform a
reverse-merge before it does it.

> And could
> there be better support for un-reverting changes when using the
> history dialog?

I reckon they've covered all the corners but if you've got any ideas
then do share them...

To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-04-22 19:50:49 CEST

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