SHA1 Hash:	2e07cd71649eebbe6ab666241fe0936d004bc70c
Date:	2007-11-27 08:59:54
User:	aku
Comment:	Bugfix in the generation of the initial symbol changesets. Keep entries apart per line-of-development.
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_pinitcsets.tcl from [3b39c5f0f7] to [30453369b1].

@@ -225,28 +225,30 @@
 
 	# First process the tags, then the branches. We know that
 	# their ids do not overlap with each other.
 
 	set lastsymbol  {}
+	set lastlod     {}
 	set lastproject {}
 	set revisions   {}
 
-	foreach {sid rid pid} [state run {
-	    SELECT S.sid, R.rid, S.pid
+	foreach {sid rid lod pid} [state run {
+	    SELECT S.sid, R.rid, R.lod, S.pid
 	    FROM  tag T, revision R, symbol S     -- T ==> R/S, using PK indices of R, S.
 	    WHERE T.rev = R.rid
 	    AND   T.sid = S.sid
-	    ORDER BY S.sid, R.date
+	    ORDER BY S.sid, R.lod, R.date
 	}] {
-	    if {$lastsymbol != $sid} {
+	    if {($lastlod != $lod) || ($lastsymbol != $sid)} {
 		if {[llength $revisions]} {
 		    incr n
 		    set  p [repository projectof $lastproject]
 		    project::rev %AUTO% $p sym $lastsymbol $revisions
 		    set revisions {}
 		}
 		set lastsymbol  $sid
+		set lastlod     $lod
 		set lastproject $pid
 	    }
 	    lappend revisions $rid
 	}
 
@@ -255,28 +257,30 @@
 	    set  p [repository projectof $lastproject]
 	    project::rev %AUTO% $p sym $lastsymbol $revisions
 	}
 
 	set lastsymbol {}
+	set lastlod    {}
 	set lasproject {}
 	set revisions  {}
 
-	foreach {sid rid pid} [state run {
-	    SELECT S.sid, R.rid, S.pid
+	foreach {sid rid lod pid} [state run {
+	    SELECT S.sid, R.rid, R.lod, S.pid
 	    FROM  branch B, revision R, symbol S  -- B ==> R/S, using PK indices of R, S.
 	    WHERE B.root = R.rid
 	    AND   B.sid  = S.sid
-	    ORDER BY S.sid, R.date
+	    ORDER BY S.sid, R.lod, R.date
 	}] {
-	    if {$lastsymbol != $sid} {
+	    if {($lastlod != $lod) || ($lastsymbol != $sid)} {
 		if {[llength $revisions]} {
 		    incr n
 		    set  p [repository projectof $lastproject]
 		    project::rev %AUTO% $p sym $lastsymbol $revisions
 		    set revisions {}
 		}
 		set lastsymbol  $sid
+		set lastlod     $lod
 		set lastproject $pid
 	    }
 	    lappend revisions $rid
 	}