I think the handling of conflicts in properties is not complete.
I could not find anythiong about this in the issue tracker:
Recipe:
* create a conflict in property ( f.i. svn:ignore)
* set svn:ignore in working copy A to TESTA
* set svn:ignore in working copy B to TESTB
* commit working copy A
* update in working copy B
* conflict shows in update dialog:
* double click on conflict: TortoiseMerge does NOT start
* right mouse click on the directory with the conflicting property
* there is no 'edit conflicts' entry
* check for modifications:
* right mouse click on the directory with the conflicting property
* 'edit conflict' is available but does NOT invoke TortoiseMerge
* 'compare with base' shows the conflict exactly and I can even correct
it, however when I try to save the property of the working copy I get:
" Could not open the file: PathToTempDir\svnB.tmp
Tested on both 1.3.3 and 1.4.0r6526
Thanks for the nice product.
Marc van Kalmthout
Received on Wed May 17 17:01:31 2006