[REVIEW] Chapter 3 | Section "Properties"

Karl Heinz Marbaise khmarbaise at gmx.de
Fri Jun 13 14:53:11 CDT 2008


Hi,

i have found a bigger issue in the Examples box: "Property Conflicts"

If you use "svn update" where an conflict will come up I got the
following expected messages:

$ svn update
Conflict for property 'text:test' discovered on 'doggie1.txt'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (h) help for more options:

That means the area about conflicts with properties has to be changed to
reflect the current state of development (RC11)...

And the other thing is that the message if a property change would
result in a conflict:
--------------------------
svnsles9:/home/kama/testvc/mom # svn up
Conflict for property 'text:test' discovered on 'doggie1.txt'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (h) help for more options: p
 C   doggie1.txt
Updated to revision 7.
svnsles9:/home/kama/testvc/mom # svn st
?      doggie1.txt.prej
 C     doggie1.txt
svnsles9:/home/kama/testvc/mom # l
total 12
drwx------  1 root root 4096 Jun 13 21:49 ./
drwx------  1 root root 4096 Jun 12 20:40 ../
drwx------  1 root root 4096 Jun 13 21:49 .svn/
drwx------  1 root root 4096 Jun 12 18:19 daughter/
-rw-------  1 root root   23 Jun 13 21:33 doggie1.txt
-rw-------  1 root root  184 Jun 13 21:49 doggie1.txt.prej
-rw-------  1 root root    1 Jun 12 18:19 kitty1.txt
drwx------  1 root root 4096 Jun 12 18:18 son/
svnsles9:/home/kama/testvc/mom # cat doggie1.txt.prej
Trying to change property 'text:test' from 'XXX' to
'asdf?\195?\182kjasd?\195?\182j
XXX
',
but property has been locally changed from 'XXX' to 'XXX
asdl?\195?\182fkjads?\195?\182lj
'.


Are different than those in the Examples box "Property Conflicts" in
particular in the file doggie1.txt.prej...(button.c.prej)

Kind regards
Karl Heinz Marbaise
-- 
SoftwareEntwicklung Beratung Schulung    Tel.: +49 (0) 2405 / 415 893
Dipl.Ing.(FH) Karl Heinz Marbaise        ICQ#: 135949029
Hauptstrasse 177                         USt.IdNr: DE191347579
52146 W├╝rselen                           http://www.soebes.de




More information about the svnbook-dev mailing list