Ulf Zibis wrote:
> 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?
If your repository is hosted on a pre 1.5 server, then no. But if your
repository is served by an 1.5.x server, then yes: you just messed with
Subversions internal merge data.
>> 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?
No. "Update to revision" will bring the files/folders to that revision
you specify. If you then make modifications, you can't commit them
because those are not in sync with the repository anymore. You can only
commit changes if your files are at the same revision as the files in
the repository.
> 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 ?
No, "revert to this revision" merges the changes backwards. If you have
local modifications, they will be preserved.
> 2. What is *this* meaning here in contrast to "Update to revision" ?
You mean "revert changes from this revision" and "revert to this
revision"? The first one reverts only the changes you committed in that
revision, the latter reverts all changes up to that revision.
>> 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.
I guess we should disable those in that situation...
Done in r13708.
> 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?
Done in r13709.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
Received on 2008-08-14 18:59:52 CEST