On Wed, 28 Mar 2007, Jon Daley wrote:
>> It *reverts* the changes of the selected revisions by reverting these
>> changes in the working copy.
> Sort of. I noticed the feature request last year to add the "revert
> to this revision" as a shortcut for highlighting all files above a revision
> and selecting "revert changes in this revision". So, I see how it came about
> to mean what it does.
> But, if I only select the one revision and say "revert to this
> revision", I didn't select any of the above revisions, so I am not sure if
> even non-command-line folks would expect it to behave like it does. But, I
> guess since other people aren't talking about it, it is okay.
I now see one reason I got confused. This feature only works if
you are selecting a lower number revision than what you have currently. I
think if you click a higher number revision it doesn't do anything, which
makes sense given the "svn merge HEAD:XXX file.name" behavior. Perhaps
tortoise should gray out that option when selecting a revision higher than
where you are? Maybe there is a reason why you would want to be able to
do that, though I think reverse merging a change in a local file that
hasn't happened yet has to be pretty obscure.
The text for the warning message when running the "revert to this
behavior" should be changed, since it doesn't really revert your local
file, but merges in your local changes.
The text currently says:
>> Do you really want to revert all changes in $filename and go back
>> to this revision?
If you have selected a revision greater than or equal to the current
revision it should say, "this isn't going to do what you think it should,
press cancel". :) Or, at least I can't think of how I would use it.
If you select an earlier revision... hrm. Does it really do HEAD:XXX?
Maybe subversion is smart enough to merge it correctly if I have revision
3 locally, and I ask it to do a merge -r5:1, does it ignore changes 4 and
5, since it knows that I don't need them? I guess it must.
I guess it should say something like, "are you sure you want to attempt to
merge your local changes back to revision X?". I don't know, that doesn't
sound much better. Perhaps someone who uses this feature could write the
text.
For the help text, I'd append one sentence.
>>> Current text:
Revert to an earlier revision. If you have made several changes, and then
decide that you really want to go back to how things were in revision N,
this is the command you need. Again, the changes are reverted in your
working copy so this operation does not affect the repository until you
commit the changes. Note that this will undo all changes made after the
selected revision, replacing the file/folder with the earlier version.
====
Revert to an earlier revision. If you have made several changes, and then
decide that you really want to go back to how things were in revision N,
this is the command you need. Again, the changes are reverted in your
working copy so this operation does not affect the repository until you
commit the changes. Note that this will undo all changes made after the
selected revision, replacing the file/folder with the earlier version. If
you have made local changes, this command will merge your changes (though
there could be conflicts)
<<<<
And the same sentence should/could be added to the other revert command as
well.
How does that sound?
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Wed Mar 28 22:19:32 2007