[svk-users] SVK Crashing on merge

[Erik Broes]

Hi,

I am having crashes while merging a branch. The error that keeps appearing for this particular merge is: 

Can't call method "local" on an undefined value at /usr/local/svk-v2.0.2/perl/SVK/Merge.pm line 692

The way I'm merging is as follows:

svk sync //mirror/db
svk cp //mirror/db/whoisserver/trunk //local/wp3-merge2
svk smerge //mirror/db/whoisserver/branches/feature-schwern-test-improvements-wp3 //local/wp3-merge2

The other way around (cp branch wp3-merge; smerge trunk wp3-merge) fails with exactly the same error.

After some debugging, I found it is looking for a key `5193397b-bf46-0410-b15e-dd55308de9fb:/local/mergebase` 
which it cannot find in the returnvalue of `merge_info_with_copy`. However I have no idea why it even wants to find anything like it.

We're running perl5.8.8 on a debian (2.6.17-12-generic) box, SVK version v2.0.2 (using Subversion bindings 1.3.2).

I've attached the result of the merge with `SVKLOGLEVEL=DEBUG` set (you can also find it on: http://nopaste.snit.ch/13611 )

I've tried to reproduce the problem with a small set of files (single file in a repo/branch) and it merges perfectly fine.

Are there any people having similar problems? or a suggestion what I can do to further debug (or provide information) to solve this problem? I've completely ran out of ideas.

Thanks in advance :)
-- 
Erik Broes
Database Group
RIPE NCC
-------------- next part --------------
$ SVKLOGLEVEL=DEBUG svk smerge //mirror/db/whoisserver/branches/feature-schwern-test-improvements-wp3 //local/wp3-merge2
Auto-merging (5305, 5742) /mirror/db/whoisserver/branches/feature-schwern-test-improvements-wp3 to /local/wp3-merge2 (base /mirror/db/whoisserver/trunk:5731).
Waiting for editor...
trying to look for the revision on /mirror/db/whoisserver/branches/feature-schwern-test-improvements-wp3 that was merged from 07fb64fd-633a-0410-a50f-d5195e96418d:/db/whoisserver/trunk at 5731 at /mirror/db/whoisserver/trunk
==> look at 5347
==> look at 5553
==> look at 5644
==> look at 5695
==> look at 5720
==> look at 5727
==> look at 5737
==> to compare with 5734
==> look at 5734
==> to compare with 5733
==> look at 5732
==> look at 5733
==> to compare with 5732
==> got 5733 as copyboundry, add 5305 as boundry as well
===> /mirror/db/whoisserver/branches/feature-schwern-test-improvements-wp3/src => /mirror/db/whoisserver/trunk/src
to 5300, from 5187, try 5733
to 5300, from 5187, try 5305
===> /mirror/db/whoisserver/branches/feature-schwern-test-improvements-wp3/src/opl-perl => /mirror/db/whoisserver/trunk/src/opl-perl
to 5300, from 5067, try 5733
to 5300, from 5067, try 5305
===> /mirror/db/whoisserver/branches/feature-schwern-test-improvements-wp3/src/opl-perl/t => /mirror/db/whoisserver/trunk/src/opl-perl/t
to 5300, from 3847, try 5733
to 5300, from 3847, try 5305
===> /mirror/db/whoisserver/branches/feature-schwern-test-improvements-wp3/src/opl-perl/t/03is.t => /mirror/db/whoisserver/trunk/src/opl-perl/t/03is.t
to 5300, from 3847, try 5733
to 5300, from 3847, try 5305
U   src/opl-perl/t/03is.t
===> /mirror/db/whoisserver/branches/feature-schwern-test-improvements-wp3/src/opl-perl/t/02bad_object.t => /mirror/db/whoisserver/trunk/src/opl-perl/t/02bad_object.t
to 5300, from 3847, try 5733
to 5300, from 3847, try 5305
U   src/opl-perl/t/02bad_object.t
===> /mirror/db/whoisserver/branches/feature-schwern-test-improvements-wp3/src/opl-perl/t/16rpsl_ok.t => /mirror/db/whoisserver/branches/feature-schwern-test-improvements-wp3/src/opl-perl/t/16fit.t
to 5313, from 5312, try 5733
to 5313, from 5312, try 5305
===> /mirror/db/whoisserver/branches/feature-schwern-test-improvements-wp3/src/opl-perl/t/16fit.t =>
A   src/opl-perl/t/16rpsl_ok.t
===> /mirror/db/whoisserver/branches/feature-schwern-test-improvements-wp3/src/opl-perl/t/11add_append.t => /mirror/db/whoisserver/trunk/src/opl-perl/t/11add_append.t
to 5300, from 3847, try 5733
to 5300, from 3847, try 5305
U   src/opl-perl/t/11add_append.t
===> /mirror/db/whoisserver/branches/feature-schwern-test-improvements-wp3/src/opl-perl/t/19test_api.t => /mirror/db/whoisserver/branches/feature-schwern-test-improvements-wp3/src/opl-perl/t/19sample.t
to 5741, from 5740, try 5733
==> src/opl-perl/t/19test_api.t(:5741) is copied from /mirror/db/whoisserver/branches/feature-schwern-test-improvements-wp3/src/opl-perl/t/19sample.t:5703
==> to resolve /mirror/db/whoisserver/branches/feature-schwern-test-improvements-wp3/src/opl-perl/t/19sample.t 5703
trying to look for the revision on /mirror/db/whoisserver/branches/feature-schwern-test-improvements-wp3 that was merged from 07fb64fd-633a-0410-a50f-d5195e96418d:/db/whoisserver/trunk at 5731 at /mirror/db/whoisserver/trunk
==> look at 5347
==> look at 5553
==> look at 5644
==> look at 5695
==> look at 5720
==> look at 5727
==> look at 5737
==> to compare with 5734
==> look at 5734
==> to compare with 5733
==> look at 5732
==> look at 5733
==> to compare with 5732
Commit message saved in svk-commitIG2FN.tmp.
Can't call method "local" on an undefined value at /usr/local/svk-v2.0.2/perl/SVK/Merge.pm line 692.