Comment: | More rebase stuff |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.66 |
Files: | files | file ages | folders |
SHA1: |
8a325f62491aa318320dccc1db3cf295 |
User & Date: | matt on 2020-05-30 23:23:42 |
Other Links: | branch diff | manifest | tags |
2020-05-31
| ||
17:00 | Cherrypick of fixes done and working check-in: 11b030cf42 user: matt tags: v1.66 | |
2020-05-30
| ||
23:23 | More rebase stuff check-in: 8a325f6249 user: matt tags: v1.66 | |
2020-05-29
| ||
16:02 | Added COMMIT protection to rebase script. check-in: 65ed339ae6 user: mrwellan tags: v1.66 | |
Added fossil-utils/Makefile version [ce704a362f].
> > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 | all : run.sh go : run.sh bash run.sh fossilrebase : fossilrebase.scm csc fossilrebase.scm run.sh : fossilrebase justtesting/*.dat ./fossilrebase dumpcmds justtesting > run.sh |
Modified fossil-utils/fossilrebase.scm from [e9f5abfd6c] to [18dabc5fe9].
︙ | ︙ | |||
73 74 75 76 77 78 79 | ;; tag0 tag1 tag2 cherrypick backout hide usedate recomment user ;; comment timestamp timestamp_sec ;; (define (get-node-details db node-id) (let* ((result #f) (count 0)) (for-each-row | | > | | 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 | ;; tag0 tag1 tag2 cherrypick backout hide usedate recomment user ;; comment timestamp timestamp_sec ;; (define (get-node-details db node-id) (let* ((result #f) (count 0)) (for-each-row (lambda (rowkey tag0 cmdnum cherrypick do-commit backout hide usedate recomment user comment timestamp timestamp_sec) (set! result `((uuid . ,rowkey) (tag0 . ,tag0) (cmdnum . ,cmdnum) (cherrypick . ,cherrypick) (do-commit . ,do-commit) (backout . ,backout) (hide . ,hide) (usedate . ,usedate) (recomment . ,recomment) (user . ,user) (comment . ,comment) (timestamp . ,timestamp) (timestamp_sec . ,timestamp_sec))) (set! count (+ count 1))) db "SELECT rowkey,tag0,cmdnum,cherrypick,do_commit,backout,hide,usedate,recomment,user,comment,timestamp,timestamp_sec FROM timeline WHERE rowkey LIKE ?;" node-id) (if (> count 1) (print "WARNING: more than one node matches " node-id ", found " count " nodes")) result)) ;; get branches to create ;; |
︙ | ︙ | |||
168 169 170 171 172 173 174 | (user (alist-ref 'user nodeinf)) (targ (alist-ref 'cherrypick cherrypick)) ;; do fossil up to this node (do-commit (alist-ref 'do-commit cherrypick)) ;; if yes do a commit (usedate (alist-ref 'usedate cherrypick)) ;; if no use current time (comment (alist-ref 'comment cherrypick)) (recomment (alist-ref 'recomment cherrypick))) (print "#======= Start of cherrypick for " uuid "=======") | | | | > > > > > > > > > > | 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 | (user (alist-ref 'user nodeinf)) (targ (alist-ref 'cherrypick cherrypick)) ;; do fossil up to this node (do-commit (alist-ref 'do-commit cherrypick)) ;; if yes do a commit (usedate (alist-ref 'usedate cherrypick)) ;; if no use current time (comment (alist-ref 'comment cherrypick)) (recomment (alist-ref 'recomment cherrypick))) (print "#======= Start of cherrypick for " uuid "=======") (print "fossil checkout " targ) (print "fossil merge --cherrypick " uuid) (if #t ;;(member do-commit '("x" "yes")) (print "fossil commit -m '" (escape-string-for-bash comment) "' " (if (equal? usedate "no") "" (conc " --date-override '" nodedate "'")) " --user-override " user )) (print "if [[ $(fossil status | grep CONFLICT | wc -l) -gt 0 ]];then") (print " echo HAVE CONFLICT - STOPPING") (print " exit 1") (print "else") (print " echo GOOD, marking node " uuid " as DONE") (print " refdb set " dbfname " timeline " uuid " status DONE") (print "fi") (print "#======= end of cherrypick for " uuid "=======") (print "") )) ;; (define (gen-rebase-commands dbname) (let* ((sqldbname (conc "/tmp/" (current-user-name) "-" dbname ".db")) (dbfname (conc (current-directory) "/" dbname))) ;; want the fully qualified path so we can call the generated script from anywhere (print "# Create sqlite db " sqldbname "...") (system (conc "refdb dump2sqlite3 " dbname " " sqldbname)) (let* ((db (open-database sqldbname)) (branches (get-new-branches db)) (cherrypicks (get-cherry-picks db))) ;; create the setup (dump-setup db) ;; create the branches (for-each (lambda (branchdat) (create-branch db (alist-ref 'branch branchdat) (alist-ref 'node branchdat))) branches) ;; create the cherrypicks (for-each (lambda (cherrypick) (do-cherrypick db cherrypick dbfname)) cherrypicks) ))) (define (dump-setup db) (for-each-row (lambda (cmd) (print cmd)) db "SELECT command FROM 'setup' ORDER BY rowkey ASC;")) (define help "fossilrebase - register commits in a refdb, edit them by hand then execute them WARNING: It is highly recommended you do this on a disconnected copy of your fossil database!! Usage: fossilrebase cmd [params ...] where cmd is one of: |
︙ | ︙ |
Added fossil-utils/justtesting/setup.dat version [27b5f4c974].
> > > > > > > > > | 1 2 3 4 5 6 7 8 9 | [command] 0 rm -rf /tmp/$USER/megatest 1 mkdir -p /tmp/$USER/megatest 2 cp /home/matt/fossils/megatest.fossil /tmp/$USER/megatest 3 cd /tmp/$USER/megatest 4 fossil open megatest.fossil;fossil up trunk 5 fossil set autosync 0 7 fossil set gmerge '' 8 fossil scrub --private --force |
Modified fossil-utils/justtesting/sheet-names.cfg from [24fcf858b3] to [a2c6169f2d].
1 2 3 | timeline extra branches | > | 1 2 3 4 | timeline extra branches setup |
Modified fossil-utils/justtesting/sxml/_sheets.sxml from [e8cb4f18e3] to [e8482886b8].
1 2 3 | ((@ (http://www.w3.org/2001/XMLSchema-instance:schemaLocation "http://www.gnumeric.org/v9.xsd")) (http://www.gnumeric.org/v10.dtd:Version | | | | < < < < < > > | | > > > > | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 | ((@ (http://www.w3.org/2001/XMLSchema-instance:schemaLocation "http://www.gnumeric.org/v9.xsd")) (http://www.gnumeric.org/v10.dtd:Version (@ (Minor "45") (Major "12") (Full "1.12.45") (Epoch "1"))) (http://www.gnumeric.org/v10.dtd:Attributes (http://www.gnumeric.org/v10.dtd:Attribute (http://www.gnumeric.org/v10.dtd:name "WorkbookView::show_horizontal_scrollbar") (http://www.gnumeric.org/v10.dtd:value "TRUE")) (http://www.gnumeric.org/v10.dtd:Attribute (http://www.gnumeric.org/v10.dtd:name "WorkbookView::show_vertical_scrollbar") (http://www.gnumeric.org/v10.dtd:value "TRUE")) (http://www.gnumeric.org/v10.dtd:Attribute (http://www.gnumeric.org/v10.dtd:name "WorkbookView::show_notebook_tabs") (http://www.gnumeric.org/v10.dtd:value "TRUE")) (http://www.gnumeric.org/v10.dtd:Attribute (http://www.gnumeric.org/v10.dtd:name "WorkbookView::do_auto_completion") (http://www.gnumeric.org/v10.dtd:value "TRUE")) (http://www.gnumeric.org/v10.dtd:Attribute (http://www.gnumeric.org/v10.dtd:name "WorkbookView::is_protected") (http://www.gnumeric.org/v10.dtd:value "FALSE"))) (urn:oasis:names:tc:opendocument:xmlns:office:1.0:document-meta (@ (urn:oasis:names:tc:opendocument:xmlns:office:1.0:version "1.2")) (urn:oasis:names:tc:opendocument:xmlns:office:1.0:meta (http://purl.org/dc/elements/1.1/:date "2020-05-31T05:18:38Z") (urn:oasis:names:tc:opendocument:xmlns:meta:1.0:creation-date "2020-05-31T05:18:24Z"))) (http://www.gnumeric.org/v10.dtd:Calculation (@ (MaxIterations "100") (ManualRecalc "0") (IterationTolerance "0.001") (FloatRadix "2") (FloatDigits "53") (EnableIteration "1"))) (http://www.gnumeric.org/v10.dtd:SheetNameIndex (http://www.gnumeric.org/v10.dtd:SheetName (@ (http://www.gnumeric.org/v10.dtd:Rows "65536") (http://www.gnumeric.org/v10.dtd:Cols "256")) "timeline") (http://www.gnumeric.org/v10.dtd:SheetName (@ (http://www.gnumeric.org/v10.dtd:Rows "65536") (http://www.gnumeric.org/v10.dtd:Cols "256")) "extra") (http://www.gnumeric.org/v10.dtd:SheetName (@ (http://www.gnumeric.org/v10.dtd:Rows "65536") (http://www.gnumeric.org/v10.dtd:Cols "256")) "branches") (http://www.gnumeric.org/v10.dtd:SheetName (@ (http://www.gnumeric.org/v10.dtd:Rows "65536") (http://www.gnumeric.org/v10.dtd:Cols "256")) "setup")) (http://www.gnumeric.org/v10.dtd:Geometry (@ (Width "1440") (Height "647"))) (http://www.gnumeric.org/v10.dtd:UIData (@ (SelectedTab "3")))) |
Modified fossil-utils/justtesting/sxml/branches.sxml from [b953d90bd4] to [14a2594a09].
︙ | ︙ | |||
53 54 55 56 57 58 59 | (http://www.gnumeric.org/v10.dtd:draft (@ (value "0"))) (http://www.gnumeric.org/v10.dtd:titles (@ (value "0"))) (http://www.gnumeric.org/v10.dtd:do_not_print (@ (value "0"))) (http://www.gnumeric.org/v10.dtd:print_range | | | | | | | 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 | (http://www.gnumeric.org/v10.dtd:draft (@ (value "0"))) (http://www.gnumeric.org/v10.dtd:titles (@ (value "0"))) (http://www.gnumeric.org/v10.dtd:do_not_print (@ (value "0"))) (http://www.gnumeric.org/v10.dtd:print_range (@ (value "GNM_PRINT_ACTIVE_SHEET"))) (http://www.gnumeric.org/v10.dtd:order "d_then_r") (http://www.gnumeric.org/v10.dtd:orientation "portrait") (http://www.gnumeric.org/v10.dtd:Header (@ (Right "") (Middle "&[tab]") (Left ""))) (http://www.gnumeric.org/v10.dtd:Footer (@ (Right "") (Middle "&[page]") (Left ""))) (http://www.gnumeric.org/v10.dtd:paper "na_letter") (http://www.gnumeric.org/v10.dtd:comments (@ (placement "GNM_PRINT_COMMENTS_IN_PLACE"))) (http://www.gnumeric.org/v10.dtd:errors (@ (PrintErrorsAs "GNM_PRINT_ERRORS_AS_DISPLAYED")))) (http://www.gnumeric.org/v10.dtd:Styles (http://www.gnumeric.org/v10.dtd:StyleRegion (@ (startRow "0") (startCol "0") (endRow "65535") (endCol "255")) (http://www.gnumeric.org/v10.dtd:Style (@ (WrapText "0") (VAlign "GNM_VALIGN_BOTTOM") (ShrinkToFit "0") (Shade "0") (Rotation "0") (PatternColor "0:0:0") (Locked "1") (Indent "0") (Hidden "0") (HAlign "GNM_HALIGN_GENERAL") (Format "General") (Fore "0:0:0") (Back "FFFF:FFFF:FFFF")) (http://www.gnumeric.org/v10.dtd:Font (@ (Unit "10") (Underline "0") (StrikeThrough "0") |
︙ | ︙ | |||
122 123 124 125 126 127 128 | (endRow "7") (endCol "2")))) (http://www.gnumeric.org/v10.dtd:SheetLayout (@ (TopLeft "A2")) (http://www.gnumeric.org/v10.dtd:FreezePanes (@ (UnfrozenTopLeft "A2") (FrozenTopLeft "A1")))) (http://www.gnumeric.org/v10.dtd:Solver | > | | 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 | (endRow "7") (endCol "2")))) (http://www.gnumeric.org/v10.dtd:SheetLayout (@ (TopLeft "A2")) (http://www.gnumeric.org/v10.dtd:FreezePanes (@ (UnfrozenTopLeft "A2") (FrozenTopLeft "A1")))) (http://www.gnumeric.org/v10.dtd:Solver (@ (SensitivityR "0") (ProgramR "0") (ProblemType "0") (NonNeg "1") (ModelType "0") (MaxTime "60") (MaxIter "1000") (Discr "0") (AutoScale "0")))) |
Modified fossil-utils/justtesting/sxml/extra.sxml from [b737f7669d] to [c6219c5a80].
︙ | ︙ | |||
53 54 55 56 57 58 59 | (http://www.gnumeric.org/v10.dtd:draft (@ (value "0"))) (http://www.gnumeric.org/v10.dtd:titles (@ (value "0"))) (http://www.gnumeric.org/v10.dtd:do_not_print (@ (value "0"))) (http://www.gnumeric.org/v10.dtd:print_range | | | > < > | | | 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 | (http://www.gnumeric.org/v10.dtd:draft (@ (value "0"))) (http://www.gnumeric.org/v10.dtd:titles (@ (value "0"))) (http://www.gnumeric.org/v10.dtd:do_not_print (@ (value "0"))) (http://www.gnumeric.org/v10.dtd:print_range (@ (value "GNM_PRINT_ACTIVE_SHEET"))) (http://www.gnumeric.org/v10.dtd:order "d_then_r") (http://www.gnumeric.org/v10.dtd:orientation "portrait") (http://www.gnumeric.org/v10.dtd:Header (@ (Right "") (Middle "&[tab]") (Left ""))) (http://www.gnumeric.org/v10.dtd:Footer (@ (Right "") (Middle "&[page]") (Left ""))) (http://www.gnumeric.org/v10.dtd:paper "na_letter") (http://www.gnumeric.org/v10.dtd:comments (@ (placement "GNM_PRINT_COMMENTS_NONE"))) (http://www.gnumeric.org/v10.dtd:errors (@ (PrintErrorsAs "GNM_PRINT_ERRORS_AS_DISPLAYED")))) (http://www.gnumeric.org/v10.dtd:Styles (http://www.gnumeric.org/v10.dtd:StyleRegion (@ (startRow "0") (startCol "0") (endRow "65535") (endCol "255")) (http://www.gnumeric.org/v10.dtd:Style (@ (WrapText "0") (VAlign "GNM_VALIGN_BOTTOM") (ShrinkToFit "0") (Shade "0") (Rotation "0") (PatternColor "0:0:0") (Locked "1") (Indent "0") (Hidden "0") (HAlign "GNM_HALIGN_GENERAL") (Format "General") (Fore "0:0:0") (Back "FFFF:FFFF:FFFF")) (http://www.gnumeric.org/v10.dtd:Font (@ (Unit "10") (Underline "0") (StrikeThrough "0") |
︙ | ︙ | |||
108 109 110 111 112 113 114 | (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "64.01") (No "2") (Count "7")))) (http://www.gnumeric.org/v10.dtd:Rows (@ (DefaultSizePts "12.1")) (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "12.64") (No "0"))) (http://www.gnumeric.org/v10.dtd:RowInfo | | < < > | | 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 | (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "64.01") (No "2") (Count "7")))) (http://www.gnumeric.org/v10.dtd:Rows (@ (DefaultSizePts "12.1")) (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "12.64") (No "0"))) (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "13.5") (No "1") (Count "17")))) (http://www.gnumeric.org/v10.dtd:Selections (@ (CursorRow "3") (CursorCol "1")) (http://www.gnumeric.org/v10.dtd:Selection (@ (startRow "3") (startCol "1") (endRow "3") (endCol "1")))) (http://www.gnumeric.org/v10.dtd:SheetLayout (@ (TopLeft "A2")) (http://www.gnumeric.org/v10.dtd:FreezePanes (@ (UnfrozenTopLeft "A2") (FrozenTopLeft "A1")))) (http://www.gnumeric.org/v10.dtd:Solver (@ (SensitivityR "0") (ProgramR "0") (ProblemType "0") (NonNeg "1") (ModelType "0") (MaxTime "60") (MaxIter "1000") (Discr "0") (AutoScale "0")))) |
Added fossil-utils/justtesting/sxml/setup.sxml version [c0e41698ed].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 | (http://www.gnumeric.org/v10.dtd:Sheet (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE") (OutlineSymbolsRight "1") (OutlineSymbolsBelow "1") (HideZero "0") (HideRowHeader "0") (HideGrid "0") (HideColHeader "0") (GridColor "0:0:0") (DisplayOutlines "1") (DisplayFormulas "0")) (http://www.gnumeric.org/v10.dtd:MaxCol "1") (http://www.gnumeric.org/v10.dtd:MaxRow "9") (http://www.gnumeric.org/v10.dtd:Zoom "1") (http://www.gnumeric.org/v10.dtd:Names (http://www.gnumeric.org/v10.dtd:Name (http://www.gnumeric.org/v10.dtd:name "Print_Area") (http://www.gnumeric.org/v10.dtd:value "#REF!") (http://www.gnumeric.org/v10.dtd:position "A1")) (http://www.gnumeric.org/v10.dtd:Name (http://www.gnumeric.org/v10.dtd:name "Sheet_Title") (http://www.gnumeric.org/v10.dtd:value "\"setup\"") (http://www.gnumeric.org/v10.dtd:position "A1"))) (http://www.gnumeric.org/v10.dtd:PrintInformation (http://www.gnumeric.org/v10.dtd:Margins (http://www.gnumeric.org/v10.dtd:top (@ (PrefUnit "mm") (Points "120"))) (http://www.gnumeric.org/v10.dtd:bottom (@ (PrefUnit "mm") (Points "120"))) (http://www.gnumeric.org/v10.dtd:left (@ (PrefUnit "mm") (Points "72"))) (http://www.gnumeric.org/v10.dtd:right (@ (PrefUnit "mm") (Points "72"))) (http://www.gnumeric.org/v10.dtd:header (@ (PrefUnit "mm") (Points "72"))) (http://www.gnumeric.org/v10.dtd:footer (@ (PrefUnit "mm") (Points "72")))) (http://www.gnumeric.org/v10.dtd:Scale (@ (type "percentage") (percentage "100"))) (http://www.gnumeric.org/v10.dtd:vcenter (@ (value "0"))) (http://www.gnumeric.org/v10.dtd:hcenter (@ (value "0"))) (http://www.gnumeric.org/v10.dtd:grid (@ (value "0"))) (http://www.gnumeric.org/v10.dtd:even_if_only_styles (@ (value "0"))) (http://www.gnumeric.org/v10.dtd:monochrome (@ (value "0"))) (http://www.gnumeric.org/v10.dtd:draft (@ (value "0"))) (http://www.gnumeric.org/v10.dtd:titles (@ (value "0"))) (http://www.gnumeric.org/v10.dtd:do_not_print (@ (value "0"))) (http://www.gnumeric.org/v10.dtd:print_range (@ (value "GNM_PRINT_ACTIVE_SHEET"))) (http://www.gnumeric.org/v10.dtd:order "d_then_r") (http://www.gnumeric.org/v10.dtd:orientation "portrait") (http://www.gnumeric.org/v10.dtd:Header (@ (Right "") (Middle "&[TAB]") (Left ""))) (http://www.gnumeric.org/v10.dtd:Footer (@ (Right "") (Middle "Page &[PAGE]") (Left ""))) (http://www.gnumeric.org/v10.dtd:paper "na_letter") (http://www.gnumeric.org/v10.dtd:comments (@ (placement "GNM_PRINT_COMMENTS_IN_PLACE"))) (http://www.gnumeric.org/v10.dtd:errors (@ (PrintErrorsAs "GNM_PRINT_ERRORS_AS_DISPLAYED")))) (http://www.gnumeric.org/v10.dtd:Styles (http://www.gnumeric.org/v10.dtd:StyleRegion (@ (startRow "0") (startCol "0") (endRow "65534") (endCol "255")) (http://www.gnumeric.org/v10.dtd:Style (@ (WrapText "0") (VAlign "GNM_VALIGN_BOTTOM") (ShrinkToFit "0") (Shade "0") (Rotation "0") (PatternColor "0:0:0") (Locked "1") (Indent "0") (Hidden "0") (HAlign "GNM_HALIGN_GENERAL") (Format "General") (Fore "0:0:0") (Back "FFFF:FFFF:FFFF")) (http://www.gnumeric.org/v10.dtd:Font (@ (Unit "10") (Underline "0") (StrikeThrough "0") (Script "0") (Italic "0") (Bold "0")) "Sans"))) (http://www.gnumeric.org/v10.dtd:StyleRegion (@ (startRow "65535") (startCol "0") (endRow "65535") (endCol "255")) (http://www.gnumeric.org/v10.dtd:Style (@ (WrapText "0") (VAlign "GNM_VALIGN_BOTTOM") (ShrinkToFit "0") (Shade "0") (Rotation "0") (PatternColor "0:0:0") (Locked "1") (Indent "0") (Hidden "0") (HAlign "GNM_HALIGN_GENERAL") (Format "General") (Fore "0:0:0") (Back "FFFF:FFFF:FFFF")) (http://www.gnumeric.org/v10.dtd:Font (@ (Unit "10") (Underline "0") (StrikeThrough "0") (Script "0") (Italic "0") (Bold "0")) "Sans")))) (http://www.gnumeric.org/v10.dtd:Cols (@ (DefaultSizePts "48")) (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "333") (No "1")))) (http://www.gnumeric.org/v10.dtd:Rows (@ (DefaultSizePts "12.75")) (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "13.5") (No "0") (Count "9")))) (http://www.gnumeric.org/v10.dtd:Selections (@ (CursorRow "7") (CursorCol "0")) (http://www.gnumeric.org/v10.dtd:Selection (@ (startRow "7") (startCol "0") (endRow "7") (endCol "255")))) (http://www.gnumeric.org/v10.dtd:SheetLayout (@ (TopLeft "A1"))) (http://www.gnumeric.org/v10.dtd:Solver (@ (SensitivityR "0") (ProgramR "0") (ProblemType "0") (NonNeg "1") (ModelType "0") (MaxTime "60") (MaxIter "1000") (Discr "0") (AutoScale "0")))) |
Modified fossil-utils/justtesting/sxml/timeline.sxml from [25523f7145] to [384f3f6bc4].
1 2 3 4 5 6 7 8 9 10 11 | (http://www.gnumeric.org/v10.dtd:Sheet (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE") (OutlineSymbolsRight "1") (OutlineSymbolsBelow "1") (HideZero "0") (HideRowHeader "0") (HideGrid "0") (HideColHeader "0") (GridColor "0:0:0") (DisplayOutlines "1") (DisplayFormulas "0")) | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | (http://www.gnumeric.org/v10.dtd:Sheet (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE") (OutlineSymbolsRight "1") (OutlineSymbolsBelow "1") (HideZero "0") (HideRowHeader "0") (HideGrid "0") (HideColHeader "0") (GridColor "0:0:0") (DisplayOutlines "1") (DisplayFormulas "0")) (http://www.gnumeric.org/v10.dtd:MaxCol "15") (http://www.gnumeric.org/v10.dtd:MaxRow "65535") (http://www.gnumeric.org/v10.dtd:Zoom "1") (http://www.gnumeric.org/v10.dtd:Names (http://www.gnumeric.org/v10.dtd:Name (http://www.gnumeric.org/v10.dtd:name "Print_Area") (http://www.gnumeric.org/v10.dtd:value "#REF!") |
︙ | ︙ | |||
53 54 55 56 57 58 59 | (http://www.gnumeric.org/v10.dtd:draft (@ (value "0"))) (http://www.gnumeric.org/v10.dtd:titles (@ (value "0"))) (http://www.gnumeric.org/v10.dtd:do_not_print (@ (value "0"))) (http://www.gnumeric.org/v10.dtd:print_range | | | > < > | | | 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 | (http://www.gnumeric.org/v10.dtd:draft (@ (value "0"))) (http://www.gnumeric.org/v10.dtd:titles (@ (value "0"))) (http://www.gnumeric.org/v10.dtd:do_not_print (@ (value "0"))) (http://www.gnumeric.org/v10.dtd:print_range (@ (value "GNM_PRINT_ACTIVE_SHEET"))) (http://www.gnumeric.org/v10.dtd:order "d_then_r") (http://www.gnumeric.org/v10.dtd:orientation "portrait") (http://www.gnumeric.org/v10.dtd:Header (@ (Right "") (Middle "&[tab]") (Left ""))) (http://www.gnumeric.org/v10.dtd:Footer (@ (Right "") (Middle "&[page]") (Left ""))) (http://www.gnumeric.org/v10.dtd:paper "na_letter") (http://www.gnumeric.org/v10.dtd:comments (@ (placement "GNM_PRINT_COMMENTS_NONE"))) (http://www.gnumeric.org/v10.dtd:errors (@ (PrintErrorsAs "GNM_PRINT_ERRORS_AS_DISPLAYED")))) (http://www.gnumeric.org/v10.dtd:Styles (http://www.gnumeric.org/v10.dtd:StyleRegion (@ (startRow "0") (startCol "0") (endRow "65535") (endCol "255")) (http://www.gnumeric.org/v10.dtd:Style (@ (WrapText "0") (VAlign "GNM_VALIGN_BOTTOM") (ShrinkToFit "0") (Shade "0") (Rotation "0") (PatternColor "0:0:0") (Locked "1") (Indent "0") (Hidden "0") (HAlign "GNM_HALIGN_GENERAL") (Format "General") (Fore "0:0:0") (Back "FFFF:FFFF:FFFF")) (http://www.gnumeric.org/v10.dtd:Font (@ (Unit "10") (Underline "0") (StrikeThrough "0") |
︙ | ︙ | |||
105 106 107 108 109 110 111 | (@ (Unit "243.8") (No "0"))) (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "89.25") (No "1") (HardSize "1") (Count "3"))) (http://www.gnumeric.org/v10.dtd:ColInfo | | | | | | | | | 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 | (@ (Unit "243.8") (No "0"))) (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "89.25") (No "1") (HardSize "1") (Count "3"))) (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "46.5") (No "4"))) (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "63.75") (No "5"))) (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "66.75") (No "11") (HardSize "1"))) (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "140.2") (No "12") (HardSize "1"))) (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "198.8") (No "13") (HardSize "1"))) (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "104.2") (No "14"))) (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "78.75") (No "15")))) (http://www.gnumeric.org/v10.dtd:Rows (@ (DefaultSizePts "12.1")) (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "13.5") (No "0"))) (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "13.5") (No "1") |
︙ | ︙ | |||
183 184 185 186 187 188 189 | (@ (Unit "13.5") (No "460") (Count "3"))) (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "12.1") (No "463") (Hidden "1") (Count "4"))) (http://www.gnumeric.org/v10.dtd:RowInfo | | < < < < < < | < < < < | < < < < < < < < | | | | | | | > | | 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 | (@ (Unit "13.5") (No "460") (Count "3"))) (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "12.1") (No "463") (Hidden "1") (Count "4"))) (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "13.5") (No "467") (Count "15"))) (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "13.5") (No "483") (Count "5"))) (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "12.1") (No "488") (Hidden "1"))) (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "13.5") (No "489") (Count "4"))) (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "13.5") (No "498") (Count "2"))) (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "12.1") (No "503") (Hidden "1") (Count "65033")))) (http://www.gnumeric.org/v10.dtd:Selections (@ (CursorRow "497") (CursorCol "7")) (http://www.gnumeric.org/v10.dtd:Selection (@ (startRow "497") (startCol "7") (endRow "497") (endCol "7")))) (http://www.gnumeric.org/v10.dtd:SheetLayout (@ (TopLeft "A463")) (http://www.gnumeric.org/v10.dtd:FreezePanes (@ (UnfrozenTopLeft "A2") (FrozenTopLeft "A1")))) (http://www.gnumeric.org/v10.dtd:Filters (http://www.gnumeric.org/v10.dtd:Filter (@ (Area "A1:O65536")) (http://www.gnumeric.org/v10.dtd:Field (@ (ValueType0 "v1.65-newview") (Value0 "60") (Type "expr") (Op0 "eq") (Index "1"))))) (http://www.gnumeric.org/v10.dtd:Solver (@ (SensitivityR "0") (ProgramR "0") (ProblemType "0") (NonNeg "1") (ModelType "0") (MaxTime "60") (MaxIter "1000") (Discr "0") (AutoScale "0")))) |
Modified fossil-utils/justtesting/timeline.dat from [4097fa25bc] to [d10b07f13c].
cannot compute difference between binary files