Re: confusion ?

Am 13.08.2008 20:15, Stefan Küng schrieb:
> Ulf Zibis wrote:
>> Scenario:
>> 1. have several files in dialogue after "Check Repository" with
>> property status "normal" ONLY on file X (revision is 273)
>> 2. choose "Properties" and see property "svn:mergeinfo" for file X
>> (no idea where this property comes from)
>
> From a previous merge. That's why it's called 'svn:mergeinfo'.

Thanks. I wonder, because I had merged the whole folder, as I remember
right. Did I destroy something valuable be deleting it?

>
>> 3. delete this property and commit --> result: revision 303
>> 4. no "revert" command on right-click (in "Log Messages" dialogue I
>> find "Revert to this revision"; would be nice here too), so "update
>> to revision" -> 301
>
> Please, please: read the subversion book:
> http://svnbook.red-bean.com/
>
> An 'update to revision' is *not* the same as a revert. And 'revert'
> means for subversion clients to undo *local* changes.
Thanks for this explanation. In NetBeans IDE "Revert modifications ..."
offers the smart dialogue shown in the attachment, which serves both.

> If you want to revert your changes from a previous revision, use the
> log dialog, right-click on that revision and choose the appropriate
> context menu entry.

Isn't this the same than "Update to revision" from the explorer's
context menu?
BTW (concerning "Log Messages" dialogue's context menu):
1. "Revert to this revision" is both, *revert* the local changes +
*update* to choosen revision. Am I wrong ?
2. What is *this* meaning here in contrast to "Update to revision" ?

>
>> 5. file X -> right-click "check-for-modifications" + "Check
>> Repository"; Result: revision is 303
>
> That's correct.
>
>> 6. no hint, if this dialogue is only for this single file or whole
>> folder, which is indicated in window title. CONFUSING also
>
> It shows what you started it for: if you right-clicked on a file,
> that's what it shows. If you right-clicked on a folder, it will show
> you the content of that folder. Why is that confusing?

Seeing only the folders path, and having the "Show xxx files" check
boxes, leads to the assumption, that the dialogue serves the whole folder.
You have it in the "Log Messages" dialogue (in case of single file the
file name (without complete path) is denoted in the window's title). Why
not also in the Check-for-modifications dialogue?

>
>> 7. in "check-for-modifications" dialogue choose "Show unmodified
>> files" + "Refresh"; Result: revision is 273
>>
>> It is confusing, whether and where I have revision 273 or 303
>
> If you "check repository", the the revision is the one in the
> repository. Otherwise your local revision.

See my explanation in my last email. I personally like to have 2 columns
"Revision" and "Remote revision"

Regards,
Ulf

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: dev-help_at_tortoisesvn.tigris.org