Diff
Not logged in

Differences From:

File tools/cvs2fossil/lib/c2f_fsym.tcl part of check-in [79c227a9c0] - Bugfix. Handle free-floating branches (their root revision was removed as unnecessary). by aku on 2007-12-01 18:36:26. [view]

To:

File tools/cvs2fossil/lib/c2f_fsym.tcl part of check-in [c4003e7b93] - The handling of detached lines of development (floating branches) still had some bugs regarding the linkage to their revisions, especially the first revision on such branches. Fixed the relevant places, added early integrity checks and updated the main checks to handle the situation. by aku on 2007-12-05 02:22:52. [view]

@@ -79,8 +79,11 @@
 	# The "obvious" parent of a branch is the branch holding the
 	# revision spawning the branch. Any other branches that are
 	# rooted at the same revision and were committed earlier than
 	# the branch are also possible parents.
+
+	# Ignore this if the branch symbol is detached.
+	if {$mybranchparent eq ""} return
 
 	$mysymbol possibleparent [[$mybranchparent lod] symbol]
 
 	foreach branch [$mybranchparent branches] {