ADDED fossil-utils/Makefile Index: fossil-utils/Makefile ================================================================== --- /dev/null +++ fossil-utils/Makefile @@ -0,0 +1,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 + + Index: fossil-utils/fossilrebase.scm ================================================================== --- fossil-utils/fossilrebase.scm +++ fossil-utils/fossilrebase.scm @@ -75,13 +75,14 @@ ;; (define (get-node-details db node-id) (let* ((result #f) (count 0)) (for-each-row - (lambda (rowkey tag0 cherrypick do-commit backout hide usedate recomment user comment timestamp timestamp_sec) + (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) @@ -90,11 +91,11 @@ (comment . ,comment) (timestamp . ,timestamp) (timestamp_sec . ,timestamp_sec))) (set! count (+ count 1))) db - "SELECT rowkey,tag0,cherrypick,do_commit,backout,hide,usedate,recomment,user,comment,timestamp,timestamp_sec FROM timeline WHERE rowkey LIKE ?;" + "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)) @@ -170,19 +171,19 @@ (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 up " targ) + (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 - " --private")) + )) (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") @@ -194,15 +195,18 @@ ;; (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 "...") + (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) @@ -214,10 +218,17 @@ (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!! ADDED fossil-utils/justtesting/setup.dat Index: fossil-utils/justtesting/setup.dat ================================================================== --- /dev/null +++ fossil-utils/justtesting/setup.dat @@ -0,0 +1,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 Index: fossil-utils/justtesting/sheet-names.cfg ================================================================== --- fossil-utils/justtesting/sheet-names.cfg +++ fossil-utils/justtesting/sheet-names.cfg @@ -1,3 +1,4 @@ timeline extra branches +setup Index: fossil-utils/justtesting/sxml/_sheets.sxml ================================================================== --- fossil-utils/justtesting/sxml/_sheets.sxml +++ fossil-utils/justtesting/sxml/_sheets.sxml @@ -1,44 +1,41 @@ ((@ (http://www.w3.org/2001/XMLSchema-instance:schemaLocation "http://www.gnumeric.org/v9.xsd")) (http://www.gnumeric.org/v10.dtd:Version - (@ (Minor "17") - (Major "10") - (Full "1.10.17") + (@ (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:type "4") (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:type "4") (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:type "4") (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:type "4") (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:type "4") (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-29T22:01:41Z"))) + "2020-05-31T05:18:24Z"))) (http://www.gnumeric.org/v10.dtd:Calculation (@ (MaxIterations "100") (ManualRecalc "0") (IterationTolerance "0.001") (FloatRadix "2") @@ -54,10 +51,14 @@ (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")) + "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 "0")))) + (@ (SelectedTab "3")))) Index: fossil-utils/justtesting/sxml/branches.sxml ================================================================== --- fossil-utils/justtesting/sxml/branches.sxml +++ fossil-utils/justtesting/sxml/branches.sxml @@ -55,11 +55,11 @@ (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 "0"))) + (@ (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 @@ -67,30 +67,30 @@ (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 - "in_place") + (@ (placement "GNM_PRINT_COMMENTS_IN_PLACE"))) (http://www.gnumeric.org/v10.dtd:errors - "as_displayed")) + (@ (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 "2") + (VAlign "GNM_VALIGN_BOTTOM") (ShrinkToFit "0") (Shade "0") (Rotation "0") (PatternColor "0:0:0") (Locked "1") (Indent "0") (Hidden "0") - (HAlign "1") + (HAlign "GNM_HALIGN_GENERAL") (Format "General") (Fore "0:0:0") (Back "FFFF:FFFF:FFFF")) (http://www.gnumeric.org/v10.dtd:Font (@ (Unit "10") @@ -124,13 +124,14 @@ (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 - (@ (ProgramR "0") + (@ (SensitivityR "0") + (ProgramR "0") (ProblemType "0") (NonNeg "1") (ModelType "0") (MaxTime "60") (MaxIter "1000") (Discr "0") (AutoScale "0")))) Index: fossil-utils/justtesting/sxml/extra.sxml ================================================================== --- fossil-utils/justtesting/sxml/extra.sxml +++ fossil-utils/justtesting/sxml/extra.sxml @@ -55,11 +55,11 @@ (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 "0"))) + (@ (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 @@ -66,30 +66,31 @@ (@ (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 "none") + (http://www.gnumeric.org/v10.dtd:comments + (@ (placement "GNM_PRINT_COMMENTS_NONE"))) (http://www.gnumeric.org/v10.dtd:errors - "as_displayed")) + (@ (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 "2") + (VAlign "GNM_VALIGN_BOTTOM") (ShrinkToFit "0") (Shade "0") (Rotation "0") (PatternColor "0:0:0") (Locked "1") (Indent "0") (Hidden "0") - (HAlign "1") + (HAlign "GNM_HALIGN_GENERAL") (Format "General") (Fore "0:0:0") (Back "FFFF:FFFF:FFFF")) (http://www.gnumeric.org/v10.dtd:Font (@ (Unit "10") @@ -110,13 +111,11 @@ (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:RowInfo - (@ (Unit "12.1") (No "18") (Count "705")))) + (@ (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") @@ -125,13 +124,14 @@ (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 - (@ (ProgramR "0") + (@ (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 Index: fossil-utils/justtesting/sxml/setup.sxml ================================================================== --- /dev/null +++ fossil-utils/justtesting/sxml/setup.sxml @@ -0,0 +1,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")))) Index: fossil-utils/justtesting/sxml/timeline.sxml ================================================================== --- fossil-utils/justtesting/sxml/timeline.sxml +++ fossil-utils/justtesting/sxml/timeline.sxml @@ -7,11 +7,11 @@ (HideGrid "0") (HideColHeader "0") (GridColor "0:0:0") (DisplayOutlines "1") (DisplayFormulas "0")) - (http://www.gnumeric.org/v10.dtd:MaxCol "14") + (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 @@ -55,11 +55,11 @@ (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 "0"))) + (@ (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 @@ -66,30 +66,31 @@ (@ (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 "none") + (http://www.gnumeric.org/v10.dtd:comments + (@ (placement "GNM_PRINT_COMMENTS_NONE"))) (http://www.gnumeric.org/v10.dtd:errors - "as_displayed")) + (@ (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 "2") + (VAlign "GNM_VALIGN_BOTTOM") (ShrinkToFit "0") (Shade "0") (Rotation "0") (PatternColor "0:0:0") (Locked "1") (Indent "0") (Hidden "0") - (HAlign "1") + (HAlign "GNM_HALIGN_GENERAL") (Format "General") (Fore "0:0:0") (Back "FFFF:FFFF:FFFF")) (http://www.gnumeric.org/v10.dtd:Font (@ (Unit "10") @@ -107,23 +108,23 @@ (@ (Unit "89.25") (No "1") (HardSize "1") (Count "3"))) (http://www.gnumeric.org/v10.dtd:ColInfo - (@ (Unit "63.75") (No "4"))) - (http://www.gnumeric.org/v10.dtd:ColInfo - (@ (Unit "48") (No "5") (Count "5"))) - (http://www.gnumeric.org/v10.dtd:ColInfo - (@ (Unit "66.75") (No "10") (HardSize "1"))) - (http://www.gnumeric.org/v10.dtd:ColInfo - (@ (Unit "140.2") (No "11") (HardSize "1"))) - (http://www.gnumeric.org/v10.dtd:ColInfo - (@ (Unit "198.8") (No "12") (HardSize "1"))) - (http://www.gnumeric.org/v10.dtd:ColInfo - (@ (Unit "104.2") (No "13"))) - (http://www.gnumeric.org/v10.dtd:ColInfo - (@ (Unit "78.75") (No "14")))) + (@ (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 @@ -185,66 +186,49 @@ (@ (Unit "12.1") (No "463") (Hidden "1") (Count "4"))) (http://www.gnumeric.org/v10.dtd:RowInfo - (@ (Unit "13.5") (No "467") (Count "2"))) - (http://www.gnumeric.org/v10.dtd:RowInfo - (@ (Unit "12.1") (No "469"))) - (http://www.gnumeric.org/v10.dtd:RowInfo - (@ (Unit "13.5") (No "470") (Count "9"))) - (http://www.gnumeric.org/v10.dtd:RowInfo - (@ (Unit "12.1") (No "479") (Count "4"))) - (http://www.gnumeric.org/v10.dtd:RowInfo - (@ (Unit "13.5") (No "483"))) - (http://www.gnumeric.org/v10.dtd:RowInfo - (@ (Unit "12.1") (No "484") (Count "2"))) - (http://www.gnumeric.org/v10.dtd:RowInfo - (@ (Unit "13.5") (No "486") (Count "2"))) + (@ (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"))) - (http://www.gnumeric.org/v10.dtd:RowInfo - (@ (Unit "12.1") (No "490") (Count "2"))) - (http://www.gnumeric.org/v10.dtd:RowInfo - (@ (Unit "13.5") (No "492"))) - (http://www.gnumeric.org/v10.dtd:RowInfo - (@ (Unit "12.1") (No "493") (Count "5"))) + (@ (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 "500") (Count "3"))) - (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "12.1") (No "503") (Hidden "1") (Count "65033")))) (http://www.gnumeric.org/v10.dtd:Selections - (@ (CursorRow "421") (CursorCol "3")) + (@ (CursorRow "497") (CursorCol "7")) (http://www.gnumeric.org/v10.dtd:Selection - (@ (startRow "421") - (startCol "3") - (endRow "421") - (endCol "3")))) + (@ (startRow "497") + (startCol "7") + (endRow "497") + (endCol "7")))) (http://www.gnumeric.org/v10.dtd:SheetLayout - (@ (TopLeft "A2")) + (@ (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:N65536")) + (@ (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 - (@ (ProgramR "0") + (@ (SensitivityR "0") + (ProgramR "0") (ProblemType "0") (NonNeg "1") (ModelType "0") (MaxTime "60") (MaxIter "1000") (Discr "0") (AutoScale "0")))) Index: fossil-utils/justtesting/timeline.dat ================================================================== --- fossil-utils/justtesting/timeline.dat +++ fossil-utils/justtesting/timeline.dat cannot compute difference between binary files