[svk-users] Problem with smerge, svk crash
Staf Verhaegen
staf.verhaegen at skynet.be
Sun Oct 5 11:41:35 EDT 2008
Hello,
I have a problem with using smerge between two branches as svk just stop
with an error in the middle.
verhaegs at lvps87-230-33-50:~/aros/trunk2> svk smerge -C //aros/branches/ABI_V1/trunk-rellibbase
Auto-merging (9098, 9278) /aros/branches/ABI_V1/trunk-rellibbase to /aros/branches/ABI_V1/trunk-genmodule_pob (base /aros/trunk:9141).
U contrib/gfx/libs/tiff
A contrib/gnu/gnumake
A contrib/gnu/gnumake/mmakefile.src
A contrib/gnu/gnumake/make-3.81-aros.diff
U contrib/gnu/abc-shell/sh.h
U contrib/gnu/abc-shell/amigaos.c
U contrib/gnu/abc-shell/mmakefile.src
U contrib/gnu/abc-shell/main.c
U contrib/gnu/findutils/findutils-4.2.31-aros.diff
g contrib/gnu/cpuid/cpuid.c
...
A documentation/documentation/users/shell/partition.en
U documentation/documentation/users/shell/makedir.en
U documentation/documentation/users/shell/copy.en
U documentation/documentation/users/shell/assign.en
U documentation/documentation/users/installation.en
Can't call method "local" on an undefined value at /opt/local/ActivePerl/5.8/site/lib/SVK/Merge.pm line 786.
If I call this without -C it stops at exactly the same place and leaves
the local tree in an intermediate state. A lot of files have been
updated but not the svk properties that track merged version numbers
etc.
Is this known problem ? How do I (help) debug this problem ?
My svk version:
verhaegs at lvps87-230-33-50:~> svk --version
This is svk, version v2.2.0 (using Subversion bindings 1.4.6)
greets,
Staf.
More information about the svk-users
mailing list