[svk-devel] Strange failures with SVK

[Bernhard Weisshuhn]

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.

regards,
bkw