Fossil

Check-in [b405f4fc]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix use (scoping) of revision items when looking for vendor branch data.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:b405f4fc04a48ff8ede5e58e23a0889661ace964
User & Date: aku 2008-02-02 05:07:20
Context
2008-02-02
06:49
Dropped primary key of temp table __im, record ids are not unique. Scenario: Several empty files. All have the same id, different paths. check-in: dfb6ee3b user: aku tags: trunk
05:07
Fix use (scoping) of revision items when looking for vendor branch data. check-in: b405f4fc user: aku tags: trunk
05:05
Fix bad setup of comment for manifest. check-in: bd9703de user: aku tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to tools/cvs2fossil/lib/c2f_prev.tcl.

413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
...
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
	# Perform the import. As part of that we determine the parent
	# we need, and convert the list of items in the changeset into
	# uuids and printable data.

	set uuid [Updatestate state $lodname \
		      [$repository importrevision [$self str] \
			   $user $message $date \
			   [Getparent state $lodname $myproject] \
			   [Getrevisioninfo $myitems]]]

	# Remember the whole changeset / uuid mapping, for the tags.

	state run {
	    INSERT INTO csuuid (cid,   uuid)
	    VALUES             ($myid, $uuid)
................................................................................
	    AND    F.fid = R.fid     -- get file of revision
	}]] {
	    lappend revisions $frid $path $fname/$revnr
	}
	return $revisions
    }

    proc Getparent {sv lodname project} {
	upvar 1 $sv state

	struct::list assign [Getisdefault $myitems] isdefault lastdefaultontrunk

	# See (a) below, we have to remember if the changeset is last
	# on vendor branch also belonging to trunk even if we find a
	# parent in the state. The caller will later (after import)
	# make us the first trunk changeset in the state (See (**)).

	if {$lastdefaultontrunk} {







|







 







|


|







413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
...
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
	# Perform the import. As part of that we determine the parent
	# we need, and convert the list of items in the changeset into
	# uuids and printable data.

	set uuid [Updatestate state $lodname \
		      [$repository importrevision [$self str] \
			   $user $message $date \
			   [Getparent state $lodname $myproject $myitems] \
			   [Getrevisioninfo $myitems]]]

	# Remember the whole changeset / uuid mapping, for the tags.

	state run {
	    INSERT INTO csuuid (cid,   uuid)
	    VALUES             ($myid, $uuid)
................................................................................
	    AND    F.fid = R.fid     -- get file of revision
	}]] {
	    lappend revisions $frid $path $fname/$revnr
	}
	return $revisions
    }

    proc Getparent {sv lodname project items} {
	upvar 1 $sv state

	struct::list assign [Getisdefault $items] isdefault lastdefaultontrunk

	# See (a) below, we have to remember if the changeset is last
	# on vendor branch also belonging to trunk even if we find a
	# parent in the state. The caller will later (after import)
	# make us the first trunk changeset in the state (See (**)).

	if {$lastdefaultontrunk} {