Eskil

Differences From Artifact [b8dba19426]:

• File src/merge.tcl — part of check-in [eaa675fac3] at 2009-02-12 18:31:27 on branch trunk — Require 8.5. Use argument expansion instead of eval. (user: peter size: 11717)

To Artifact [08c9600628]:

• File src/merge.tcl — part of check-in [ace521ad0a] at 2009-02-12 19:11:35 on branch trunk — More 8.5 features used: lassign instead of foreach. lrepeat+lreverse Math commands for some expressions. (user: peter size: 11709)

37
38
39
40
41
42
43
44
45
46
47
48
49
50
51

    set ch1 [open $::diff($top,leftFile) r]
    set ch2 [open $::diff($top,rightFile) r]
    set doingLine1 1
    set doingLine2 1
    set changeNo 0
    foreach change $::diff($top,changes) {
        foreach {start length type line1 n1 line2 n2} $change break
        set data1 {}
        set data2 {}
        while {$doingLine1 < $line1} {
            gets $ch1 apa
            append data1 $apa\n
            incr doingLine1
        }

|

37
38
39
40
41
42
43
44
45
46
47
48
49
50
51

    set ch1 [open $::diff($top,leftFile) r]
    set ch2 [open $::diff($top,rightFile) r]
    set doingLine1 1
    set doingLine2 1
    set changeNo 0
    foreach change $::diff($top,changes) {
        lassign $change start length type line1 n1 line2 n2
        set data1 {}
        set data2 {}
        while {$doingLine1 < $line1} {
            gets $ch1 apa
            append data1 $apa\n
            incr doingLine1
        }