SHA1 Hash:	6d63634309ff7e98019353cf539e471641a65730
Date:	2007-11-24 04:19:15
User:	aku
Comment:	Tweaked log output a bit. Bugfixes: Forgot to propagate the border information into SplitRevisions, and a varname typo.
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_pbreakacycle.tcl from [ba2a0b846b] to [42309dffc2].

@@ -155,27 +155,27 @@
 
 	    # limits : dict (revision -> list (max predecessor commit, min sucessor commit))
 
 	    ComputeLimits $cset limits border
 
-	    log write 6 breakacycle "At commit position border $border"
+	    log write 6 breakacycle "Using commit position $border as border"
 
 	    # Then we sort the file level items based on there they
 	    # sit relative to the border into before and after the
 	    # border.
 
-	    SplitRevisions $limits normalrevisions backwardrevisions
+	    SplitRevisions $limits $border normalrevisions backwardrevisions
 
 	    set replacements [project::rev split $cset $normalrevisions $backwardrevisions]
 	    cyclebreaker replace $graph $cset $replacements
 
 	    # At last check that the normal frament is indeed not
 	    # backward, and iterate over the possibly still backward
 	    # second fragment.
 
 	    struct::list assign $replacements normal backward
-	    if {[IsABackwardBranch $dg $normal]} { trouble internal "The normal fragment is unexpectedly a backward branch" }
+	    if {[IsABackwardBranch $graph $normal]} { trouble internal "The normal fragment is unexpectedly a backward branch" }
 
 	    set cset $backward
 	}
 	return
     }
@@ -279,11 +279,11 @@
 	return $res
     }
 
     proc MinSuccessorPosition {item} { lindex $item 1 }
 
-    proc SplitRevisions {limits nv bv} {
+    proc SplitRevisions {limits border nv bv} {
 	upvar 1 $nv normalrevisions $bv backwardrevisions
 
 	set normalrevisions   {}
 	set backwardrevisions {}