When I commit using subeclipse, pre-commit complains saying MERGE request failed...409 conflict.
Error: Commit failed (details follow): Error: MERGE request failed on '/repos/test/trunk' Error: 'pre-commit' hook failed with error output: ...409 conflict Post-commit doesnt complain, but it doesnt close tickets either. My pre-commit script looks like this: #!/bin/sh REPOS="$1" TXN="$2" LOG=`/usr/bin/svnlook log -t "$TXN" "$REPOS"` TRAC_ENV='/srv/servername/trac/servername/' /usr/bin/python /usr/share/doc/trac/contrib/trac-pre-commit-hook "$TRAC_ENV" "$LOG" || exit 1 I've also run: chmod 755 pre-commit post-commit and chown -R www-data.www-data on my svn and trac directories Please help. --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Trac Users" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/trac-users?hl=en -~----------~----~----~----~------~----~------~--~---
