Fossil SCM
Fix use (scoping) of revision items when looking for vendor branch data.
Commit
b405f4fc04a48ff8ede5e58e23a0889661ace964
Parent
bd9703dee6e075f…
1 file changed
+3
-3
| --- tools/cvs2fossil/lib/c2f_prev.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_prev.tcl | ||
| @@ -415,11 +415,11 @@ | ||
| 415 | 415 | # uuids and printable data. |
| 416 | 416 | |
| 417 | 417 | set uuid [Updatestate state $lodname \ |
| 418 | 418 | [$repository importrevision [$self str] \ |
| 419 | 419 | $user $message $date \ |
| 420 | - [Getparent state $lodname $myproject] \ | |
| 420 | + [Getparent state $lodname $myproject $myitems] \ | |
| 421 | 421 | [Getrevisioninfo $myitems]]] |
| 422 | 422 | |
| 423 | 423 | # Remember the whole changeset / uuid mapping, for the tags. |
| 424 | 424 | |
| 425 | 425 | state run { |
| @@ -442,14 +442,14 @@ | ||
| 442 | 442 | lappend revisions $frid $path $fname/$revnr |
| 443 | 443 | } |
| 444 | 444 | return $revisions |
| 445 | 445 | } |
| 446 | 446 | |
| 447 | - proc Getparent {sv lodname project} { | |
| 447 | + proc Getparent {sv lodname project items} { | |
| 448 | 448 | upvar 1 $sv state |
| 449 | 449 | |
| 450 | - struct::list assign [Getisdefault $myitems] isdefault lastdefaultontrunk | |
| 450 | + struct::list assign [Getisdefault $items] isdefault lastdefaultontrunk | |
| 451 | 451 | |
| 452 | 452 | # See (a) below, we have to remember if the changeset is last |
| 453 | 453 | # on vendor branch also belonging to trunk even if we find a |
| 454 | 454 | # parent in the state. The caller will later (after import) |
| 455 | 455 | # make us the first trunk changeset in the state (See (**)). |
| 456 | 456 |
| --- tools/cvs2fossil/lib/c2f_prev.tcl | |
| +++ tools/cvs2fossil/lib/c2f_prev.tcl | |
| @@ -415,11 +415,11 @@ | |
| 415 | # uuids and printable data. |
| 416 | |
| 417 | set uuid [Updatestate state $lodname \ |
| 418 | [$repository importrevision [$self str] \ |
| 419 | $user $message $date \ |
| 420 | [Getparent state $lodname $myproject] \ |
| 421 | [Getrevisioninfo $myitems]]] |
| 422 | |
| 423 | # Remember the whole changeset / uuid mapping, for the tags. |
| 424 | |
| 425 | state run { |
| @@ -442,14 +442,14 @@ | |
| 442 | lappend revisions $frid $path $fname/$revnr |
| 443 | } |
| 444 | return $revisions |
| 445 | } |
| 446 | |
| 447 | proc Getparent {sv lodname project} { |
| 448 | upvar 1 $sv state |
| 449 | |
| 450 | struct::list assign [Getisdefault $myitems] isdefault lastdefaultontrunk |
| 451 | |
| 452 | # See (a) below, we have to remember if the changeset is last |
| 453 | # on vendor branch also belonging to trunk even if we find a |
| 454 | # parent in the state. The caller will later (after import) |
| 455 | # make us the first trunk changeset in the state (See (**)). |
| 456 |
| --- tools/cvs2fossil/lib/c2f_prev.tcl | |
| +++ tools/cvs2fossil/lib/c2f_prev.tcl | |
| @@ -415,11 +415,11 @@ | |
| 415 | # uuids and printable data. |
| 416 | |
| 417 | set uuid [Updatestate state $lodname \ |
| 418 | [$repository importrevision [$self str] \ |
| 419 | $user $message $date \ |
| 420 | [Getparent state $lodname $myproject $myitems] \ |
| 421 | [Getrevisioninfo $myitems]]] |
| 422 | |
| 423 | # Remember the whole changeset / uuid mapping, for the tags. |
| 424 | |
| 425 | state run { |
| @@ -442,14 +442,14 @@ | |
| 442 | lappend revisions $frid $path $fname/$revnr |
| 443 | } |
| 444 | return $revisions |
| 445 | } |
| 446 | |
| 447 | proc Getparent {sv lodname project items} { |
| 448 | upvar 1 $sv state |
| 449 | |
| 450 | struct::list assign [Getisdefault $items] isdefault lastdefaultontrunk |
| 451 | |
| 452 | # See (a) below, we have to remember if the changeset is last |
| 453 | # on vendor branch also belonging to trunk even if we find a |
| 454 | # parent in the state. The caller will later (after import) |
| 455 | # make us the first trunk changeset in the state (See (**)). |
| 456 |