Fossil

Check-in [68cf3ecd]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:cvs2fossil, fixed off-by-one errors in the application of RCS patches.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 68cf3ecdb70a1157ee98653eea4eda72bf98dd43
User & Date: aku 2008-03-05 05:28:16
Context
2008-03-06
00:26
Fix problems on the stat page that appear for larger repositories. check-in: 80dc46d6 user: drh tags: trunk
2008-03-05
05:28
cvs2fossil, fixed off-by-one errors in the application of RCS patches. check-in: 68cf3ecd user: aku tags: trunk
03:44
Merge to [f08599e87b]. check-in: f4aa6d09 user: aku tags: cvs2fossil-complete, trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to tools/cvs2fossil/lib/c2f_file.tcl.

505
506
507
508
509
510
511
512



513
514
515
516
517
518
519



520



521
522
523
524
525
526
527
	    switch -exact -- $cmd {
		d {
		    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 }



		    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 }



		    set ooff $sl
		    incr i $cn
		}
	    }
	}
	foreach x [lrange $base $ooff end] { lappend res $x }
	return [join $res \n]







|
>
>
>






|
>
>
>
|
>
>
>







505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
	    switch -exact -- $cmd {
		d {
		    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 [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 [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
		}
	    }
	}
	foreach x [lrange $base $ooff end] { lappend res $x }
	return [join $res \n]