Fossil

Check-in [0adaabf1]
Login

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

Overview
Comment:Fixed bug in the code detaching a vendor branch. Left link to removed parent dangling, and killed connection to first on branch. No more.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:0adaabf11231d63b5ded188dc7fe95d987257a88
User & Date: aku 2008-01-27 20:40:48
Context
2008-01-27
20:42
Allow for detached branches when checking lod consistency. Fixed formatting nit. Added debug helper method. check-in: d3aa3388 user: aku tags: trunk
20:40
Fixed bug in the code detaching a vendor branch. Left link to removed parent dangling, and killed connection to first on branch. No more. check-in: 0adaabf1 user: aku tags: trunk
20:38
Added comments to the sql commands in the integrity checks. check-in: 727f370c user: aku tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

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

959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
	    # Cut out the vendor branch symbol

	    set vendor [$first parentbranch]
	    integrity assert {$vendor ne ""} {First NTDB revision has no branch}
	    if {[$vendor parent] eq $rev11} {
		$rev11 removebranch        $vendor
		$rev11 removechildonbranch $first
		$vendor cutchild
		$first cutfromparentbranch
		lappend myroots $first
	    }

	    # Change the type of first (typically from Change to Add):
	    $first retype add

	    # Move any tags and branches from the old to the new root.







|
|







959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
	    # Cut out the vendor branch symbol

	    set vendor [$first parentbranch]
	    integrity assert {$vendor ne ""} {First NTDB revision has no branch}
	    if {[$vendor parent] eq $rev11} {
		$rev11 removebranch        $vendor
		$rev11 removechildonbranch $first
		$vendor cutbranchparent    ;# bp = rev11, about to be gone
		$first cutfromparentbranch ;# pb = vendor, to be a detached LOD
		lappend myroots $first
	    }

	    # Change the type of first (typically from Change to Add):
	    $first retype add

	    # Move any tags and branches from the old to the new root.