SHA1 Hash:	d3aa33884b6ce408dc8ad45fa2a28a43fbc788ac
Date:	2008-01-27 20:42:01
User:	aku
Comment:	Allow for detached branches when checking lod consistency. Fixed formatting nit. Added debug helper method.
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

• branch=trunk inherited from [a28c83647d]
• sym-trunk inherited from [a28c83647d]

Modified tools/cvs2fossil/lib/c2f_fsym.tcl from [b2ddfe62f2] to [139ee190b5].

@@ -140,11 +140,11 @@
     method position    {} { return $mybranchposition }
 
     # Tag acessor methods.
 
     method tagrevnr  {}    { return $mynr }
-    method settagrev {rev} {set mytagrev $rev ; return }
+    method settagrev {rev} { set mytagrev $rev ; return }
 
     # Derived information
 
     method lod {} { return $mylod }
 
@@ -158,11 +158,17 @@
 	# Consistency check. The symbol's line-of-development has to
 	# be same as the line-of-development of its source (parent
 	# revision of a branch, revision of a tag itself).
 
 	switch -exact -- $mytype {
-	    branch  { set slod [$mybranchparent lod] }
+	    branch  {
+		# However, ignore this if the branch symbol is
+		# detached.
+		if {$mybranchparent eq ""} return
+
+		set slod [$mybranchparent lod]
+	    }
 	    tag     { set slod [$mytagrev       lod] }
 	}
 
 	if {$mylod ne $slod} {
 	    trouble fatal "For $mytype [$mysymbol name]: LOD conflict with source, '[$mylod name]' vs. '[$slod name]'"
@@ -202,10 +208,26 @@
 		    state run [string map $map $cmd]
 		}
 	    }
 	}
 
+	return
+    }
+
+    method DUMP {label} {
+	puts "$label = $self $mytype [$self name] \{"
+	switch -exact -- $mytype {
+	    tag {
+		puts "\tR\t$mytagrev"
+	    }
+	    branch {
+		puts "\tP\t$mybranchparent"
+		puts "\tC\t$mybranchchild"
+		puts "\t\t<$mynr>"
+	    }
+	}
+	puts "\}"
 	return
     }
 
     # # ## ### ##### ######## #############
     ## State