Fossil SCM
Fix issues with column names in diff.tcl
Commit
0aceaa3b277861a55107901e2576f53913e778b6e6392bd584a65a43a16338b4
Parent
5548a9111619665…
2 files changed
+1
-1
+1
-1
+1
-1
| --- src/diff.tcl | ||
| +++ src/diff.tcl | ||
| @@ -115,11 +115,11 @@ | ||
| 115 | 115 | set fromIndex [lsearch -glob $fossilcmd *-from] |
| 116 | 116 | set toIndex [lsearch -glob $fossilcmd *-to] |
| 117 | 117 | set branchIndex [lsearch -glob $fossilcmd *-branch] |
| 118 | 118 | set checkinIndex [lsearch -glob $fossilcmd *-checkin] |
| 119 | 119 | if {[lsearch -glob $fossilcmd *-label]>=0 |
| 120 | - || [lsearch [lindex $fossilcmd 2] {xdiff fdiff merge-info}]>=0 | |
| 120 | + || [lsearch {xdiff fdiff merge-info} [lindex $fossilcmd 2]]>=0 | |
| 121 | 121 | } { |
| 122 | 122 | set fA {} |
| 123 | 123 | set fB {} |
| 124 | 124 | } else { |
| 125 | 125 | if {[string match *?--external-baseline* $fossilcmd]} { |
| 126 | 126 |
| --- src/diff.tcl | |
| +++ src/diff.tcl | |
| @@ -115,11 +115,11 @@ | |
| 115 | set fromIndex [lsearch -glob $fossilcmd *-from] |
| 116 | set toIndex [lsearch -glob $fossilcmd *-to] |
| 117 | set branchIndex [lsearch -glob $fossilcmd *-branch] |
| 118 | set checkinIndex [lsearch -glob $fossilcmd *-checkin] |
| 119 | if {[lsearch -glob $fossilcmd *-label]>=0 |
| 120 | || [lsearch [lindex $fossilcmd 2] {xdiff fdiff merge-info}]>=0 |
| 121 | } { |
| 122 | set fA {} |
| 123 | set fB {} |
| 124 | } else { |
| 125 | if {[string match *?--external-baseline* $fossilcmd]} { |
| 126 |
| --- src/diff.tcl | |
| +++ src/diff.tcl | |
| @@ -115,11 +115,11 @@ | |
| 115 | set fromIndex [lsearch -glob $fossilcmd *-from] |
| 116 | set toIndex [lsearch -glob $fossilcmd *-to] |
| 117 | set branchIndex [lsearch -glob $fossilcmd *-branch] |
| 118 | set checkinIndex [lsearch -glob $fossilcmd *-checkin] |
| 119 | if {[lsearch -glob $fossilcmd *-label]>=0 |
| 120 | || [lsearch {xdiff fdiff merge-info} [lindex $fossilcmd 2]]>=0 |
| 121 | } { |
| 122 | set fA {} |
| 123 | set fB {} |
| 124 | } else { |
| 125 | if {[string match *?--external-baseline* $fossilcmd]} { |
| 126 |
+1
-1
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -256,11 +256,11 @@ | ||
| 256 | 256 | memset(&cfg, 0, sizeof(cfg)); |
| 257 | 257 | cfg.diffFlags = DIFF_TCL; |
| 258 | 258 | cfg.nContext = mb.nContext; |
| 259 | 259 | if( diffMode==12 || diffMode==13 ){ |
| 260 | 260 | pLeft = &pivot; |
| 261 | - zTagLeft = "baselines"; | |
| 261 | + zTagLeft = "baseline"; | |
| 262 | 262 | }else{ |
| 263 | 263 | pLeft = &v1; |
| 264 | 264 | zTagLeft = "local"; |
| 265 | 265 | } |
| 266 | 266 | if( diffMode==12 ){ |
| 267 | 267 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -256,11 +256,11 @@ | |
| 256 | memset(&cfg, 0, sizeof(cfg)); |
| 257 | cfg.diffFlags = DIFF_TCL; |
| 258 | cfg.nContext = mb.nContext; |
| 259 | if( diffMode==12 || diffMode==13 ){ |
| 260 | pLeft = &pivot; |
| 261 | zTagLeft = "baselines"; |
| 262 | }else{ |
| 263 | pLeft = &v1; |
| 264 | zTagLeft = "local"; |
| 265 | } |
| 266 | if( diffMode==12 ){ |
| 267 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -256,11 +256,11 @@ | |
| 256 | memset(&cfg, 0, sizeof(cfg)); |
| 257 | cfg.diffFlags = DIFF_TCL; |
| 258 | cfg.nContext = mb.nContext; |
| 259 | if( diffMode==12 || diffMode==13 ){ |
| 260 | pLeft = &pivot; |
| 261 | zTagLeft = "baseline"; |
| 262 | }else{ |
| 263 | pLeft = &v1; |
| 264 | zTagLeft = "local"; |
| 265 | } |
| 266 | if( diffMode==12 ){ |
| 267 |