[Box Backup-dev] HEADSUP: svn and trac are moving!
James O'Gorman
boxbackup-dev at fluffy.co.uk
Wed Nov 7 00:38:05 GMT 2007
Hi Chris,
On Tue, Nov 06, 2007 at 11:26:55PM +0000, Chris Wilson wrote:
> Sorry, it was working yesterday but now I get the following error on
> checkin:
>
> chris at 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'
Google is my friend :-)
http://ariejan.net/2007/05/21/merge-request-failed-on-pathtofile/
I've updated the post-commit-hook script now, so if you 'svn update' it
should be ok...
James
More information about the Boxbackup-dev
mailing list