On 09.01.2015 15:27, Stohr, Alexander wrote:
> Hello,
>
> The attached patch changes the text for the check box "Break locks"
> into "Break local tools locks" for improving the clarity of this box.
> I updated all English versions of the string plus the German version.
>
> Reasoning:
> SVN has a lock type on the local file system copy to serialize the local tools access
> and SVN has some other lock type on the server to serialize user editing.
> We should always be able to strongly distinguish them - especially for places
> where items for the repo and for the local copy are presented side to side - like in clean-up.
I have to disagree here. When I read "Break local tools locks" my first
thought was: "what is a local tools lock? And what's a local tool?".
Also please have a look at the box "The three meanings of 'Lock'" here:
http://svnbook.red-bean.com/en/1.7/svn.advanced.locking.html
> PS:
> The file src/Resources/TortoiseProcENG.rc has the attribute SVN:mime-type set to application/octet-stream
> but this file seems to be in a 16 bit wide-char _text_ format. At least I could easily search and edit it.
> Due to this attribute for creating the attached patch I had to use "--force" on the SVN command line tool.
> I am unsure if it would be fine to change this to e.g. text/plain or similar.
UTF16 is text, yes. But not for svn. svn an only diff ascii/utf8 text
files properly, not utf16 or even utf32 files. That's why the mime-type
is set to a binary format.
While creating a patch for such files is possible, applying such a patch
will fail.
So in the future if you have to change such a file, you have to include
the full file instead of relying on the patch.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest interface to (Sub)version control
/_/ \_\ http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3093974
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-01-10 10:16:23 CET