SHA1 Hash:	68cf3ecdb70a1157ee98653eea4eda72bf98dd43
Date:	2008-03-05 05:28:16
User:	aku
Comment:	cvs2fossil, fixed off-by-one errors in the application of RCS patches.
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_file.tcl from [8d01091d5f] to [43f6a2b4c2].

@@ -507,19 +507,28 @@
 		    incr sl -1
 		    incr el -1
 		    if {$sl < $ooff} { trouble internal {Deletion before last edit} }
 		    if {$sl > $blen} { trouble internal {Deletion past file end} }
 		    if {$el > $blen} { trouble internal {Deletion beyond file end} }
-		    foreach x [lrange $base $ooff $sl] { lappend res $x }
+		    foreach x [lrange $base $ooff [expr {$sl - 1}]] {
+			log write 15 file {.|$x|}
+			lappend res $x
+		    }
 		    set  ooff $el
 		}
 		a {
 		    if {$sl < $ooff} { trouble internal {Insert before last edit} }
 		    if {$sl > $blen} { trouble internal {Insert past file end} }
 
-		    foreach x [lrange $base $ooff $sl]             { lappend res $x }
-		    foreach x [lrange $lines $i [expr {$i + $cn}]] { lappend res $x }
+		    foreach x [lrange $base $ooff [expr {$sl - 1}]] {
+			log write 15 file {.|$x|}
+			lappend res $x
+		    }
+		    foreach x [lrange $lines $i [expr {$i + $cn - 1}]] {
+			log write 15 file {+|$x|}
+			lappend res $x
+		    }
 		    set ooff $sl
 		    incr i $cn
 		}
 	    }
 	}