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

Revert vs reverse merge

From: Rick Yorgason <rick_at_longbowgames.com>
Date: Tue, 1 Apr 2014 02:46:50 +0000 (UTC)

Hi all,

I have a lot of non-technical Tortoise users at my company, and they're
constantly confused by the two meanings of 'revert' in TortoiseSVN: (I'm
explaining this from their point of view, which I think is quite valid)

* 'Revert...' gives them an earlier version of the file, and doesn't affect
any other users.

* 'Revert changes from this revision' and 'Revert to this revision' gives
them an earlier version of the file, but *does* affect other users once they
commit.

The second case is really a reverse merge, and I think Tortoise could do
well to adopt similar language, eg 'Reverse changes from this revision' and
'Reverse changes after this revision'.

Now, the *actual* problem here is that these users keep using 'Revert to
this revision' instead of 'Update to this revision', which makes sense,
because they don't really want to "update" -- which implies getting a newer
version of the file -- they want to go backwards.

So this solution doesn't completely solve the problem, since the "update"
ambiguity still remains, but I think changing "revert" to "reverse" solves
the more important issue of "revert" meaning two things. It also doesn't
hurt that "reverse" sounds like a function that makes changes, and that it's
more similar to the command line language.

Cheers,

-Rick-

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3075598

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-04-01 06:01:59 CEST

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