On Wednesday 28 March 2007 22:19, Jon Daley wrote:
> 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?
This will get pretty complicated if the working copy is in a state of mixed
revisions. I don't think the effort to implement all corner cases is worth
it.
> 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?
I've added a sentence, so that it is clear that the changes are merged and
that the modifications are only in the working copy:
Do you really want to revert all changes in $filename and go back to this
revision? These changes will be merged into your working copy.
> 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 haven't checked it, but I tend to agree. Anyway, this would need to be
done by the subversion libraries and not by TortoiseSVN. Could you check
this and then contact the subversion list directly?
> 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)
> <<<<
Committed in revision 9082.
> And the same sentence should/could be added to the other revert command
> as well.
Done in the same revision.
Tobias
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu Mar 29 22:24:18 2007