#4 strange "Conflict during update"

[Jan Beyer]

Sometimes, I get the message:
SVN error: Conflict during update
after committing my .odt file to the repo, although I'm the only one working on this file. There shouldn't be any problems updating the repo and the local file...

Or did I miss something? I'm a novice, so that might very well be...

Best Regards,
Jan

[Jan Beyer]

Logged In: YES
user_id=1397499
Originator: YES

May it be, that odfsvn cannot handle insertions into already existing text, but only appending new text at the end?

Probably I must be doing something wrong, as I can't believe this to be true...

[Jan Beyer]

Logged In: YES
user_id=1397499
Originator: YES

A step-by-step-way to reproduce this:
1) get any .odt-file from a SVN repo via odfsvn co <URL>
2) add a line of text at the beginning of the file, save
3) odfsvn ci <file>
4) odfsvn update <file>
This will fail with

SVN error: Conflict during update at content.xml

after adding the following patch to the odfsvn-sources:

Index: odfsvn/svn.py

--- odfsvn/svn.py (Revision 5)
+++ odfsvn/svn.py (Arbeitskopie)
@@ -168,7 +168,7 @@
for (action,path) in output]

if 'C' in [action for (action,path) in output]:
- raise SVNException("Conflict during update")
+ raise SVNException("Conflict during update at "+path)

for (action, path) in output:
if action in ('A', 'U', 'G'):

Best Regards,
Jan