Menu

#1 SVN Merge Errors

open
nobody
5
2009-03-11
2009-03-11
Anonymous
No

Hi,

Using the latest version of svn2web setup as a post-commit, rather than a pre-commit hook.

Generally, most of the time, the scripts work perfectly, however, there are times when the commit completely fails with the following error:-

svn: MERGE of '/branches/Development/httpdocs/system/application/config': 200 OK (http://mydomain.co.uk.svn)

Finally managed to track down a pattern to this, by committing only individual files until the problem reoccurred... and it would seem that any file name that contains a non Alphanumeric Char, '_' and '-' being prime examples, produce this error.

Went through the generated expect script, and manually ran this through expect to see what happens, and I get the following errors:-

ftp> put 'system/application/config/form_validation.php' 'form_validation.php'
local: 'system/application/config/form_validation.php' remote: 'form_validation.php'
local: 'system/application/config/form_validation.php': No such file or directory

Now, the ftp upload has worked. I can verify this by making an arbitrary modification, and then committing to the repo. On further investigation, I took the expect script and escaped the underscore character, manually running it again, and this time it works without the additional error line.

I've a feeling that this is a peculiarity with expect?

Discussion

Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.