[svk-devel] Strange failures with SVK
warlord at MIT.EDU
Tue Oct 31 13:28:05 EST 2006
I've been running with SVK trunk for a while (although I've been
bad about keeping up to date), and every once in a while a local
branch seems to get out of sync with the mirror.. I try to make
sure I "svk push" and "svk pull", but earlier today I got into a
situation where SVK thought that some files were deleted out of
my local branch when I had never touched this directory in this
[warlord at cliodev src]$ svk push --verbatim
Auto-merging (49055, 49088) /local/cmdln-lib to /mirrors/src/trunk (base /mirrors/src/trunk:49086).
===> Auto-merging (49055, 49087) /local/cmdln-lib to /mirrors/src/trunk (base /mirrors/src/trunk:49086).
Merging back to mirror source svn+ssh://my.server.com/svn/src.
Enter passphrase for key '/home/warlord/.ssh/id_dsa':
New merge ticket: 4b02fed6-1982-4324-8d42-994ac65bc45c:/local/cmdln-lib:49087
A repository hook failed: 'pre-commit' hook failed with error output:
You must enter a log message!
I have no idea why these files were changed; I never touched this
directory myself; I just did pushes and pulls. I don't even have
the 'srviso' directory checked out in my WC!
I was able to "fix" this by moving the branch out of the way,
creating the branch anew via a new "svk cp", and then re-applying
my (single) change. but it's annoying that I have to do this.
This is the second time this has happened on this branch.
I just tried updating SVK trunk but "make test" throws a bunch
of failures. I'll mention those in another email.
Derek Atkins, SB '93 MIT EE, SM '95 MIT Media Laboratory
Member, MIT Student Information Processing Board (SIPB)
URL: http://web.mit.edu/warlord/ PP-ASEL-IA N1NWH
warlord at MIT.EDU PGP key available
More information about the svk-devel