Reverting help with TSVN...

I'm having some trouble explain (and understanding myself) reverting to
some of our "non-technical" users. They are all using TSVN and the
command-line is completely foreign to them.

Here is the very common (and almost only) case:

Someone will commit some changes, then we realize that we don't want
them and wish to revert to a previous version of the file. This is
always a single file that needs to be reverted back one or more
revisions. These files are binary Photoshop files.

What seems logical to everyone is to:

1) Select TSVN->Update to Revision to pull down the old file
2) Commit the changes back to be the new head.

We are not interested in rolling things back, just having the old file
become the new head.

Problem is TSVN thinks the file is up-to-date (it has the little green
check-mark). If we do a commit, it says there is nothing to commit.

We can't just "touch" the file, because it hasn't changed, so it can't
be committed. If we change the file, then we get errors that things are
out of date.

If we go into the Log, select the file and the do "Revert changes from
this revision", we get conflicts. These are binary files, so they can't
be merged. In any case, we don't want to "merge" them, we just want the
old revision to become the head.

Currently, we have to pull the file down to a separate file, copy it
over the current HEAD and then commit. This is cumbersome and not very
intuitive and is slowly turning the artists off to version control.

Is there an easier way to just revert a file back to a previous revision
that doesn't involve doing merges and reverse merges, because this isn't
going to be understood very well. Plus I sold SVN to this group by
telling them how easy it would be to make changes then revert out of
them, which doesn't seem to be true (at least to the no-technical users).

Am I missing something obvious?

Thanks, Ron

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Fri Jan 27 22:38:25 2006