If you have pysvn-1.7.0, merge script won't work and will give you the following error:
check balInputList.txt
check balInputList.txt done
check WebKitFiles.txt
check WebKitFiles.txt done
check data integrity done
Traceback (most recent call last):
File "./BAL/Scripts/Merge/merge.py", line 55, in <module>
cleanOWB.clean(trunkPath)
File "/home/developer/owb-src/Galekid_current/BAL/Scripts/Merge/cleanOWB.py", line 8, in clean
if createPatch(path):
File "/home/developer/owb-src/Galekid_current/BAL/Scripts/Merge/cleanOWB.py", line 40, in createPatch
diff_text = client.diff("/tmp/merge.tmp", path)
pysvn._pysvn_2_5.ClientError: Can't open '/tmp/merge.tmp/tempfile.tmp': No such file or directory
