[svk-users] follow-up: Problem with smerge, svk crash

[Staf Verhaegen]

Replying to meself,

> Hello,
> 
> I have a problem with using smerge between two branches as svk just stop
> with an error in the middle.
> 
> ...

I worked around the problem but I still think this should be handled as
a bug:

If have a main trunk //aros/trunk and two
branches //aros/branches/ABI_V1/trunk-rellibbase
and //aros/branches/ABI_V1/trunk-genmodule_pob

trunk-rellibbase is based on trunk and trunk-genmodule_pob is based on
trunk-rellibbase.
All smerge operations were done by first doing them on a checked out
directory and then commiting it after fixing conflicts.[*]
The problem was that an smerge trunk -> trunk-rellibbase succeeded but
then an smerge trunk-rellibbase -> trunk-genmodule_pob failed with an
exit out of svk. As reported the two last lines looked like:
...
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 

Now I did an smerge trunk -> trunk-genmodule_pob and that succeeded and
it gives the following lines in the same place:
...
U   documentation/documentation/users/installation.en
A + documentation/documentation/users/index.fr
D   documentation/documentation/users/index.fr.txt
...
After that I did a smerge trunk-rellibbase -> trunk-genmodule_pob
without a crash.

It this seems that the 'A +' merge triggers a bug when the smerge is
done indirectly through trunk-rellibbase.

infos of the two branches (after the fixed merge):
verhaegs at lvps87-230-33-50:~/aros/trunk2> svk info //aros/branches/ABI_V1/trunk-genmodule_pob
Depot Path: //aros/branches/ABI_V1/trunk-rellibbase
Project name: aros
Revision: 9283
Last Changed Rev.: 9278
Last Changed Date: 2008-10-05
Mirrored From: https://svn.aros.org/svn/aros, Rev. 29679
Copied From: /aros/trunk, Rev. 6585
Merged From: /aros/trunk, Rev. 9274
Merged From: /aros/branches/trunk-peridbase, Rev. 7596
Merged From: /aros/branches/ABI_V1/trunk-rellibbase-crash, Rev. 6800
Merged From: /aros/branches/ABI_V1/trunk-DOS, Rev. 6591

verhaegs at lvps87-230-33-50:~/aros/trunk2> svk info //aros/branches/ABI_V1/trunk-genmodule_pob
Depot Path: //aros/branches/ABI_V1/trunk-genmodule_pob
Project name: aros
Revision: 9283
Last Changed Rev.: 9283
Last Changed Date: 2008-10-06
Mirrored From: https://svn.aros.org/svn/aros, Rev. 29679
Copied From: /aros/branches/ABI_V1/trunk-rellibbase, Rev. 7077
Copied From: /aros/trunk, Rev. 6585
Merged From: /aros/trunk, Rev. 9281
Merged From: /aros/branches/ABI_V1/trunk-rellibbase, Rev. 9098
Merged From: /aros/branches/trunk-peridbase, Rev. 7596
Merged From: /aros/branches/ABI_V1/trunk-rellibbase-crash, Rev. 6800
Merged From: /aros/branches/ABI_V1/trunk-DOS, Rev. 6591

greets,
Staf.

[*] smerge trunk -> trunk-rellibbase thus actually means
% svk switch //aros/branches/ABI_V1/trunk-rellibbase
% svk merge //aros/trunk
fix confilcts
% svk commit