[Box Backup-dev] HEADSUP: svn and trac are moving!

[Chris Wilson]

Hi James,

On Mon, 5 Nov 2007, James O'Gorman wrote:
> On Mon, Nov 05, 2007 at 11:42:12PM +0000, Chris Wilson wrote:
>>  Better, I can commit now, but I get this error:
>>
>>  Warning: 'post-commit' hook failed with error output:
>>  /data/svn/hooks/post-commit: /usr/local/bin/commit-email.pl: not found
>>  /usr/local/bin/python: can't open file
>>  '/usr/local/share/trac/trac-post-commit-hook': [Errno 2] No such file or
>>  directory
>
> Gah, got it. That should sort it now. This'll teach me for avoiding
> documentation...

Sorry, it was working yesterday but now I get the following error on 
checkin:

chris@gcc(bb-merge)$ svn ci bin/bbackupquery/BackupQueries.cpp
Sending        bin/bbackupquery/BackupQueries.cpp
Transmitting file data .svn: Commit failed (details follow):
svn: MERGE request failed on '/svn/box/trunk/bin/bbackupquery'
svn: MERGE of '/svn/box/trunk/bin/bbackupquery': 200 OK 
(http://www.boxbackup.org)
svn: Your commit message was left in a temporary file:
svn: 
'/home/chris/project/boxi/bb-trunk/bin/bbackupquery/svn-commit.tmp'

Cheers, Chris.
-- 
_____ __     _
\  __/ / ,__(_)_  | Chris Wilson <0000 at qwirx.com> - Cambs UK |
/ (_/ ,\/ _/ /_ \ | Security/C/C++/Java/Perl/SQL/HTML Developer |
\ _/_/_/_//_/___/ | We are GNU-free your mind-and your software |