Index: VERSION ================================================================== --- VERSION +++ VERSION @@ -1,1 +1,1 @@ -2.25 +2.24 Index: src/graph.c ================================================================== --- src/graph.c +++ src/graph.c @@ -979,14 +979,11 @@ if( nTimewarp==0 ){ /* Priority bits: ** ** 0x04 The preferred branch ** - ** 0x02 A merge rail - a rail that contains merge lines into - ** the preferred branch. Only applies if a preferred branch - ** is defined. This improves the display of r=BRANCH - ** options to /timeline. + ** 0x02 A merge rail - a rail that contains merge lines ** ** 0x01 A rail that merges with the preferred branch */ u8 aPriority[GR_MAX_RAIL]; memset(aPriority, 0, p->mxRail+1); @@ -999,15 +996,10 @@ if( pRow->mergeIn[i] ) aPriority[i] |= 1; } if( pRow->mergeOut>=0 ) aPriority[pRow->mergeOut] |= 1; } } - for(i=0; i<=p->mxRail; i++){ - if( p->mergeRail & BIT(i) ){ - aPriority[i] |= 2; - } - } }else{ j = 1; aPriority[0] = 4; for(pRow=p->pFirst; pRow; pRow=pRow->pNext){ if( pRow->iRail==0 ){ @@ -1015,10 +1007,15 @@ if( pRow->mergeIn[i] ) aPriority[i] |= 1; } if( pRow->mergeOut>=0 ) aPriority[pRow->mergeOut] |= 1; } } + } + for(i=0; i<=p->mxRail; i++){ + if( p->mergeRail & BIT(i) ){ + aPriority[i] |= 2; + } } #if 0 fprintf(stderr,"mergeRail: 0x%llx\n", p->mergeRail); fprintf(stderr,"Priority:"); Index: test/amend.test ================================================================== --- test/amend.test +++ test/amend.test @@ -296,19 +296,20 @@ set tc 0 foreach {tagt result} $tagtests { incr tc set tags {} set cancels {} - set t1exp [join $result ", "] + set t1exp "" set t2exp "*" set t3exp "*" set t5exp "*" foreach tag $tagt { lappend tags -tag $tag lappend cancels -cancel $tag } foreach res $result { + append t1exp ", $res" append t3exp "Add*tag*\"$res\".*" append t5exp "Cancel*tag*\"$res\".*" } foreach res [lsort -nocase $result] { append t2exp "sym-$res*" Index: test/merge5.test ================================================================== --- test/merge5.test +++ test/merge5.test @@ -23,11 +23,11 @@ } protOut { fossil sqlite3 --no-repository reacts badly to SQL dumped from repositories created from fossil older than version 2.0. } -#test merge5-sqlite3-issue false knownBug +test merge5-sqlite3-issue false knownBug test_cleanup_then_return # Verify the results of a check-out # proc checkout-test {testid expected_content} { Index: test/stash.test ================================================================== --- test/stash.test +++ test/stash.test @@ -168,14 +168,14 @@ ######## # fossil stash show|cat ?STASHID? ?DIFF-OPTIONS? # fossil stash [g]diff ?STASHID? ?DIFF-OPTIONS? -#fossil stash show -#test stash-1-show {[normalize_result] eq $diff_stash_1} -#fossil stash diff -#test stash-1-diff {[normalize_result] eq $diff_stash_1} knownBug +fossil stash show +test stash-1-show {[normalize_result] eq $diff_stash_1} +fossil stash diff +test stash-1-diff {[normalize_result] eq $diff_stash_1} knownBug ######## # fossil stash pop stash-test 2 pop { @@ -206,16 +206,16 @@ # fossil: ./src/delta.c:231: checksum: Assertion '...' failed. # Should be triggered by this stash-WY-1 test. fossil checkout --force c1 fossil clean fossil mv --soft f1 f1new -#stash-test WY-1 {-expectError save -m "Reported 2016-02-09"} { -# REVERT f1 -# DELETE f1new -#} -changes { -#} -addremove { -#} -exists {f1 f2 f3} -notexists {f1new} -knownbugs {-code -result} +stash-test WY-1 {-expectError save -m "Reported 2016-02-09"} { + REVERT f1 + DELETE f1new +} -changes { +} -addremove { +} -exists {f1 f2 f3} -notexists {f1new} -knownbugs {-code -result} # TODO: add tests that verify the saved stash is sensible. Possibly # by applying it and checking results. But until the SQLITE_CONSTRAINT # error is fixed, there is nothing stashed to test. @@ -296,17 +296,16 @@ }] -changes { RENAMED f2 -> f2n } -addremove { } -exists {f1 f2n} -notexists {f2} -fossil stash save -m f2n -#stash-test 3-2 {save -m f2n} { -# REVERT f2 -# DELETE f2n -#} -exists {f1 f2} -notexists {f2n} -knownbugs {-result} +stash-test 3-2 {save -m f2n} { + REVERT f2 + DELETE f2n +} -exists {f1 f2} -notexists {f2n} -knownbugs {-result} fossil stash show -#test stash-3-2-show-1 {![regexp {\sf1} $RESULT]} knownBug +test stash-3-2-show-1 {![regexp {\sf1} $RESULT]} knownBug test stash-3-2-show-2 {[regexp {\sf2n} $RESULT]} stash-test 3-2-pop {pop} { UPDATE f1 UPDATE f2n } -changes { Index: test/tester.tcl ================================================================== --- test/tester.tcl +++ test/tester.tcl @@ -308,11 +308,10 @@ comment-format \ crlf-glob \ crnl-glob \ default-csp \ default-perms \ - default-skin \ diff-binary \ diff-command \ dont-commit \ dont-push \ dotfiles \ Index: test/utf.test ================================================================== --- test/utf.test +++ test/utf.test @@ -35,11 +35,11 @@ set i 1 foreach {fileName result} $args { set fileName [file join $tempPath $fileName] fossil test-looks-like-utf $fileName set result [string map [list %TEMP% $tempPath \r\n \n] $result] - # if {$::RESULT ne $result} {puts stdout $::RESULT; exit} + # if {$::RESULT ne $result} {puts stdout $::RESULT} test utf-check-$testname.$i {$::RESULT eq $result} incr i } } @@ -17609,25 +17609,25 @@ Has flag LOOK_LONG: no Has flag LOOK_INVALID: no Has flag LOOK_ODD: no Has flag LOOK_SHORT: no} -#utf-check 1179 utf-check-1179-2-129-1.jnk \ -#{File "%TEMP%/utf-check-1179-2-129-1.jnk" has 7 bytes. -#Starts with UTF-8 BOM: no -#Starts with UTF-16 BOM: yes -#Looks like UTF-8: yes -#Has flag LOOK_NUL: no -#Has flag LOOK_CR: no -#Has flag LOOK_LONE_CR: no -#Has flag LOOK_LF: no -#Has flag LOOK_LONE_LF: no -#Has flag LOOK_CRLF: no -#Has flag LOOK_LONG: no -#Has flag LOOK_INVALID: yes -#Has flag LOOK_ODD: no -#Has flag LOOK_SHORT: no} +utf-check 1179 utf-check-1179-2-129-1.jnk \ +{File "%TEMP%/utf-check-1179-2-129-1.jnk" has 7 bytes. +Starts with UTF-8 BOM: no +Starts with UTF-16 BOM: yes +Looks like UTF-8: no +Has flag LOOK_NUL: yes +Has flag LOOK_CR: no +Has flag LOOK_LONE_CR: no +Has flag LOOK_LF: no +Has flag LOOK_LONE_LF: no +Has flag LOOK_CRLF: no +Has flag LOOK_LONG: no +Has flag LOOK_INVALID: yes +Has flag LOOK_ODD: no +Has flag LOOK_SHORT: no} utf-check 1180 utf-check-1180-2-130-0.jnk \ {File "%TEMP%/utf-check-1180-2-130-0.jnk" has 4 bytes. Starts with UTF-8 BOM: no Starts with UTF-16 BOM: yes @@ -24121,41 +24121,41 @@ Has flag LOOK_LONG: no Has flag LOOK_INVALID: yes Has flag LOOK_ODD: no Has flag LOOK_SHORT: no} -#utf-check 1586 utf-check-1586-3-128-0.jnk \ -#{File "%TEMP%/utf-check-1586-3-128-0.jnk" has 6 bytes. -#Starts with UTF-8 BOM: no -#Starts with UTF-16 BOM: reversed -#Looks like UTF-16: no -#Has flag LOOK_NUL: yes -#Has flag LOOK_CR: no -#Has flag LOOK_LONE_CR: no -#Has flag LOOK_LF: no -#Has flag LOOK_LONE_LF: no -#Has flag LOOK_CRLF: no -#Has flag LOOK_LONG: no -#Has flag LOOK_INVALID: no -#Has flag LOOK_ODD: no -#Has flag LOOK_SHORT: no} - -#utf-check 1587 utf-check-1587-3-128-1.jnk \ -#{File "%TEMP%/utf-check-1587-3-128-1.jnk" has 7 bytes. -#Starts with UTF-8 BOM: no -#Starts with UTF-16 BOM: reversed -#Looks like UTF-8: no -#Has flag LOOK_NUL: yes -#Has flag LOOK_CR: no -#Has flag LOOK_LONE_CR: no -#Has flag LOOK_LF: no -#Has flag LOOK_LONE_LF: no -#Has flag LOOK_CRLF: no -#Has flag LOOK_LONG: no -#Has flag LOOK_INVALID: yes -#Has flag LOOK_ODD: no -#Has flag LOOK_SHORT: no} +utf-check 1586 utf-check-1586-3-128-0.jnk \ +{File "%TEMP%/utf-check-1586-3-128-0.jnk" has 6 bytes. +Starts with UTF-8 BOM: no +Starts with UTF-16 BOM: no +Looks like UTF-8: no +Has flag LOOK_NUL: yes +Has flag LOOK_CR: no +Has flag LOOK_LONE_CR: no +Has flag LOOK_LF: no +Has flag LOOK_LONE_LF: no +Has flag LOOK_CRLF: no +Has flag LOOK_LONG: no +Has flag LOOK_INVALID: yes +Has flag LOOK_ODD: no +Has flag LOOK_SHORT: no} + +utf-check 1587 utf-check-1587-3-128-1.jnk \ +{File "%TEMP%/utf-check-1587-3-128-1.jnk" has 7 bytes. +Starts with UTF-8 BOM: no +Starts with UTF-16 BOM: no +Looks like UTF-8: no +Has flag LOOK_NUL: yes +Has flag LOOK_CR: no +Has flag LOOK_LONE_CR: no +Has flag LOOK_LF: no +Has flag LOOK_LONE_LF: no +Has flag LOOK_CRLF: no +Has flag LOOK_LONG: no +Has flag LOOK_INVALID: yes +Has flag LOOK_ODD: no +Has flag LOOK_SHORT: no} utf-check 1588 utf-check-1588-3-129-0.jnk \ {File "%TEMP%/utf-check-1588-3-129-0.jnk" has 6 bytes. Starts with UTF-8 BOM: no Starts with UTF-16 BOM: no Index: www/changes.wiki ================================================================== --- www/changes.wiki +++ www/changes.wiki @@ -1,15 +1,15 @@