[svk-devel] Strange failures with SVK
Derek Atkins
warlord at MIT.EDU
Wed Nov 1 08:33:07 EST 2006
Quoting Bernhard Weisshuhn <bkw at weisshuhn.de>:
> Derek Atkins schrieb:
>
>> [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':
>> D srviso/2.6/Srv/RPMS/ace-5.5-1.FC4.i386.rpm
>> D srviso/2.6/Srv/RPMS/ace-kokyu-5.5-1.FC4.i386.rpm
>> D srviso/2.6/Srv/RPMS/ace-xml-5.5-1.FC4.i386.rpm
>> D srviso/2.6/Srv/RPMS/tao-1.5-1.FC4.i386.rpm
>> U srviso/2.6/Srv/base/comps.xml
>> 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!
>
> Just guessing: Somebody in the upstream repository enabled pre-commit
> checks to enforce log messages in the meantime. Merging older
> transactions with empty logging messages fails, even though they are
> from the same repository. But they are from a time, when this
> restriction was not yet in place.
>
> I think, this problem should go away later, when all your branchpoints
> are older that the moment the pre-commit check was activated.
No, try again. The question is why does SVK think these files were
removed in my branch when I NEVER TOUCHED THEM! I know why the push
back failed; I'm sorry I confused you. What I don't know is why SVK
thinks these files were removed when then weren't.... All I've done
is "pull" and "push", and I've never touched this particular directory
in my local copy.
The fact that the SVN server fails when it sees an empty merge only saved
the real data from being destroyed by SVK!
So let me restate the question: why does SVK think these files were
deleted?
> regards,
> bkw
-derek
--
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
mailing list