I use:
svn, versione 1.5.2 (r32768)
compilato Sep 6 2008, 07:52:43
When I update to head and there is a conflict, svn create 3 files:
file.mine, file.rREPOS, file.rBASE and fileOUTPUT.
FileOUTPUT is created with x attribute:
[simeoni_at_localhost mc]$ ll messaggi.lxt*
-rwxr-xr-x 1 simeoni simeoni 1208 2009-01-30 09:14 messaggi.lxt* <<<<< x
attribute
-rw-r--r-- 1 simeoni simeoni 1154 2009-01-30 09:14 messaggi.lxt.mine
-rw-r--r-- 1 simeoni simeoni 1139 2009-01-30 09:14 messaggi.lxt.r127
-rw-r--r-- 1 simeoni simeoni 1154 2009-01-30 09:14 messaggi.lxt.r128
The fileOUTPUT with x attribute cause kdiff3 version 0.9.93 (see
kdiff3.jpeg) modify fileOUTPUT with only x attribute:
[simeoni_at_localhost mc]$ ll messaggi.lxt*
---x------ 1 simeoni simeoni 1208 2009-01-30 09:14 messaggi.lxt* <<<<<
only x attribute
-rw-r--r-- 1 simeoni simeoni 1154 2009-01-30 09:14 messaggi.lxt.mine
-rw-r--r-- 1 simeoni simeoni 1139 2009-01-30 09:14 messaggi.lxt.r127
-rw-r--r-- 1 simeoni simeoni 1154 2009-01-30 09:14 messaggi.lxt.r128
The fileOUTPUT without permission is a problem for me, because I must
modify manually (chmod) for the right access with my application.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1073184
Received on 2009-01-30 18:40:43 CET