1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
|
}
return 0
}
proc openLeft {top} {
if {[doOpenLeft $top]} {
set ::diff($top,mode) ""
doDiff $top
}
}
proc openRight {top} {
if {[doOpenRight $top]} {
set ::diff($top,mode) ""
doDiff $top
}
}
proc openConflict {top} {
global Pref
if {[doOpenRight $top]} {
|
>
>
|
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
|
}
return 0
}
proc openLeft {top} {
if {[doOpenLeft $top]} {
set ::diff($top,mode) ""
set ::diff($top,mergeFile) ""
doDiff $top
}
}
proc openRight {top} {
if {[doOpenRight $top]} {
set ::diff($top,mode) ""
set ::diff($top,mergeFile) ""
doDiff $top
}
}
proc openConflict {top} {
global Pref
if {[doOpenRight $top]} {
|
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
|
if {$rev eq ""} {
tk_messageBox -icon error -title "Eskil Error" -message \
"Could not figure out which revison control system\
\"$::diff($top,rightFile)\" is under." -type ok
return
}
startRevMode $top $rev $::diff($top,rightFile)
doDiff $top
}
}
proc openBoth {top forget} {
if {[doOpenLeft $top]} {
if {[doOpenRight $top $forget]} {
set ::diff($top,mode) ""
doDiff $top
}
}
}
#####################################
# GUI stuff
|
>
>
|
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
|
if {$rev eq ""} {
tk_messageBox -icon error -title "Eskil Error" -message \
"Could not figure out which revison control system\
\"$::diff($top,rightFile)\" is under." -type ok
return
}
startRevMode $top $rev $::diff($top,rightFile)
set ::diff($top,mergeFile) ""
doDiff $top
}
}
proc openBoth {top forget} {
if {[doOpenLeft $top]} {
if {[doOpenRight $top $forget]} {
set ::diff($top,mode) ""
set ::diff($top,mergeFile) ""
doDiff $top
}
}
}
#####################################
# GUI stuff
|