[Box Backup-dev] HEADSUP: svn and trac are moving!
Chris Wilson
boxbackup-dev@fluffy.co.uk
Wed, 7 Nov 2007 00:40:28 +0000 (GMT)
Hi James,
On Wed, 7 Nov 2007, James O'Gorman wrote:
>> 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...
Thanks!
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 |