cvs 1.11.1pl1: "checkout -j" bug

[Dr. Dieter Maurer]

"checkout" is called several times with identical parameters.

It remembers the "-j" options in static variables "join_rev1"
and "join_rev2". Selection between assignment to "join_rev1"
or "join_rev2" is done with

        if (join_rev1) 
            if (join_rev2) error(...)
            else join_rev2= optarg;
        else join_rev1= optarg;

This is wrong for the second call to "checkout"...

Patch attached.


Kind regards
Dieter

checkout.pat
Description: Text document