| Subject: | The implementation of merge method is different from the API in the document. |
I used merge method and I found it doesn't work.
I read VCS::Lite code and I found a defference between the API and the Implementation.
VCS::Lite merge method API is described as following
in SYNOPSIS
Show quoted text
> # merge
>
> my $lit4 = $lit->merge($lit->delta($lit2),$lit->delta($lit3));
> print OUTFILE $lit4->text;
in the explanation of merge method
Show quoted text> merge
>
> my $lit4 = $lit->merge($delt1,$delt2,\&confl);
This explanation is different from the implementation.
The arguments of merge is not VCS::Lite::Delta object, but VCS::Lite object.
And the third argument(&confl) is not implemented.
The following is correct.
in SYNOPSIS
Show quoted text> # merge
>
> my $lit4 = $lit->merge($lit2,$lit3);
> print OUTFILE $lit4->text;
in the explanation of merge method
Show quoted text> merge
>
> my $lit4 = $lit->merge($lit2,$lit3);
Best regards.
Kato, Atsushi