Differences From:

File tools/cvs2fossil/lib/c2f_cyclebreaker.tcl part of check-in [3e18606b5c] - Bugfix: Sort pending nodes fully deterministic, and moved to separate helper command. Tweaked log output. by aku on 2007-11-27 09:05:45. [view]

To:

File tools/cvs2fossil/lib/c2f_cyclebreaker.tcl part of check-in [04d76a9e79] - Renamed changeset method to describe modified results, and updated the one invoker. Modified the sorting of time ranges. Now by max, min as tiebreaker, and object name as last tiebreaker. by aku on 2007-11-29 07:55:01. [view]

@@ -215,9 +215,9 @@
 		    array set nmap [$cset nextmap]
 		    foreach r [lsort -dict [array names nmap]] {
 			foreach succrev $nmap($r) {
 			    log write 2 cyclebreaker \
-				"LOOP * rev <$r> --> rev <$succrev> --> cs [project::rev strlist [project::rev ofrev $succrev]]"
+				"LOOP * rev <$r> --> rev <$succrev> --> cs [project::rev str [project::rev ofitem $succrev]]"
 			}
 		    }
 		}
 	    }
@@ -289,9 +289,11 @@
     }
 
     proc ScheduleCandidates {} {
 	::variable mybottom
-	set mybottom [lsort -index 1 -integer [lsort -index 2 -integer [lsort -index 0 -dict $mybottom]]]
+	# Sort by cset object name, lower border of timerange, at last
+	# by the upper border.
+	set mybottom [lsort -index 2 -integer [lsort -index 1 -integer [lsort -index 0 -dict $mybottom]]]
 	return
     }
 
     proc ShowPendingNodes {} {