| ︙ | | | ︙ | |
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
|
}
lappend eskil($top,leftMergeData) $data1
lappend eskil($top,rightMergeData) $data2
set eskil($top,mergeSelection,$changeNo) \
[WhichSide $top $line1 $n1 $line2 $n2 conflict comment ancLines]
set eskil($top,mergeSelection,Conflict,$changeNo) $conflict
set eskil($top,mergeSelection,Comment,$changeNo) $comment
set eskil($top,mergeSelection,AncLines,$changeNo) "Lines from ancestor file:\n[join $ancLines \n]"
if {$conflict} {
set eskil($top,mergeSelection,AnyConflict) 1
}
incr changeNo
}
set data1 {}
set data2 {}
|
>
|
>
|
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
|
}
lappend eskil($top,leftMergeData) $data1
lappend eskil($top,rightMergeData) $data2
set eskil($top,mergeSelection,$changeNo) \
[WhichSide $top $line1 $n1 $line2 $n2 conflict comment ancLines]
set eskil($top,mergeSelection,Conflict,$changeNo) $conflict
set eskil($top,mergeSelection,Comment,$changeNo) $comment
set ancLines [lsort -dictionary -unique $ancLines]
set eskil($top,mergeSelection,AncLines,$changeNo) \
"Lines from ancestor file:\n[join $ancLines \n]"
if {$conflict} {
set eskil($top,mergeSelection,AnyConflict) 1
}
incr changeNo
}
set data1 {}
set data2 {}
|
| ︙ | | | ︙ | |
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
|
# This chunk has lines only to the right
# Look for changes on the right side
for {set t $line2} {$t < $line2 + $n2} {incr t} {
if {[info exists ::eskil($top,ancestorRight,$t)]} {
set right($::eskil($top,ancestorRight,$t)) 1
}
if {[info exists ::eskil($top,ancestorRight,$t,lines)]} {
set ancLines $::eskil($top,ancestorRight,$t,lines)
}
}
if {[array size right] == 0} {
# No changes to the right, so deleted to the left : Keep left side
set comment "Left: Delete"
return 1
}
|
|
|
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
|
# This chunk has lines only to the right
# Look for changes on the right side
for {set t $line2} {$t < $line2 + $n2} {incr t} {
if {[info exists ::eskil($top,ancestorRight,$t)]} {
set right($::eskil($top,ancestorRight,$t)) 1
}
if {[info exists ::eskil($top,ancestorRight,$t,lines)]} {
lappend ancLines {*}$::eskil($top,ancestorRight,$t,lines)
}
}
if {[array size right] == 0} {
# No changes to the right, so deleted to the left : Keep left side
set comment "Left: Delete"
return 1
}
|
| ︙ | | | ︙ | |
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
|
# This chunk has lines only to the left
# Look for changes on the left side
for {set t $line1} {$t < $line1 + $n1} {incr t} {
if {[info exists ::eskil($top,ancestorLeft,$t)]} {
set left($::eskil($top,ancestorLeft,$t)) 1
}
if {[info exists ::eskil($top,ancestorLeft,$t,lines)]} {
set ancLines $::eskil($top,ancestorLeft,$t,lines)
}
}
if {[array size left] == 0} {
# No changes to the left, so deleted to the right : Keep right side
set comment "Right: Delete"
return 2
}
|
|
|
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
|
# This chunk has lines only to the left
# Look for changes on the left side
for {set t $line1} {$t < $line1 + $n1} {incr t} {
if {[info exists ::eskil($top,ancestorLeft,$t)]} {
set left($::eskil($top,ancestorLeft,$t)) 1
}
if {[info exists ::eskil($top,ancestorLeft,$t,lines)]} {
lappend ancLines {*}$::eskil($top,ancestorLeft,$t,lines)
}
}
if {[array size left] == 0} {
# No changes to the left, so deleted to the right : Keep right side
set comment "Right: Delete"
return 2
}
|
| ︙ | | | ︙ | |
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
|
# Collect left side info
for {set t $line1} {$t < $line1 + $n1} {incr t} {
if {[info exists ::eskil($top,ancestorLeft,$t)]} {
set left($::eskil($top,ancestorLeft,$t)) 1
}
if {[info exists ::eskil($top,ancestorLeft,$t,lines)]} {
set ancLines $::eskil($top,ancestorLeft,$t,lines)
}
}
# No changes against ancestor on left side means it is just
# changed to the right : Keep right
if {[array size left] == 0} {
set comment "Right: Change"
return 2
}
# Collect right side info
for {set t $line2} {$t < $line2 + $n2} {incr t} {
if {[info exists ::eskil($top,ancestorRight,$t)]} {
set right($::eskil($top,ancestorRight,$t)) 1
}
if {[info exists ::eskil($top,ancestorRight,$t,lines)]} {
set ancLines $::eskil($top,ancestorRight,$t,lines)
}
}
# No changes against ancestor on right side means it is just
# changed to the left : Keep left
if {[array size right] == 0} {
set comment "Left: Change"
|
|
|
|
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
|
# Collect left side info
for {set t $line1} {$t < $line1 + $n1} {incr t} {
if {[info exists ::eskil($top,ancestorLeft,$t)]} {
set left($::eskil($top,ancestorLeft,$t)) 1
}
if {[info exists ::eskil($top,ancestorLeft,$t,lines)]} {
lappend ancLines {*}$::eskil($top,ancestorLeft,$t,lines)
}
}
# No changes against ancestor on left side means it is just
# changed to the right : Keep right
if {[array size left] == 0} {
set comment "Right: Change"
return 2
}
# Collect right side info
for {set t $line2} {$t < $line2 + $n2} {incr t} {
if {[info exists ::eskil($top,ancestorRight,$t)]} {
set right($::eskil($top,ancestorRight,$t)) 1
}
if {[info exists ::eskil($top,ancestorRight,$t,lines)]} {
lappend ancLines {*}$::eskil($top,ancestorRight,$t,lines)
}
}
# No changes against ancestor on right side means it is just
# changed to the left : Keep left
if {[array size right] == 0} {
set comment "Left: Change"
|
| ︙ | | | ︙ | |