SHA1 Hash:	229050721f10aa7c9a12a1fdb0c4ea96cfc33494
Date:	2007-12-05 02:24:25
User:	aku
Comment:	Fixed log progress use in last breaker pass. Disabled the check regarding revision order. It still triggers and I can't see anything wrong. Pressing forward for now, i.e. get the remaining passes done, then revisit this issue.
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 [4af9517982] to [3f3d02eb94].

@@ -112,11 +112,11 @@
 	log write 2 breakacycle {Loading revision commit order}
 
 	set n 0
 	state transaction {
 	    foreach {cid pos} [state run { SELECT cid, pos FROM csorder }] {
-		log progress 2 breakacycle $n
+		log progress 2 breakacycle $n {}
 		set cset [project::rev of $cid]
 		$cset setpos $pos
 		set mycset($pos) $cset
 		lappend myrevisionchangesets $cset
 		incr n
@@ -371,11 +371,12 @@
 	    } else {
 		::variable mycset
 		set old [$mycset($mylastpos) str]@$mylastpos
 	    }
 
-	    integrity assert 0 {Ordering of revision changesets violated, [$cset str]@$new is not immediately after $old}
+	    #integrity assert 0 {Ordering of revision changesets violated, [$cset str]@$new is not immediately after $old}
+	    log write 2 breakacycle {Ordering of revision changesets violated, [$cset str]@$new is not immediately after $old}
 	}
 
 	set mylastpos $new
 	return
     }