Fossil SCM
Merge updates from trunk.
Commit
e4db8fe84f5d547c94079a32c36ac4650cfe4210
Parent
25e9c00b8c6baf9…
5 files changed
-1
-1
-1
-1
+7
-1
| --- test/merge5.test | ||
| +++ test/merge5.test | ||
| @@ -37,11 +37,10 @@ | ||
| 37 | 37 | test merge5-$testid 1 |
| 38 | 38 | } |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | catch {exec $::fossilexe info} res |
| 42 | -puts res=$res | |
| 43 | 42 | if {![regexp {use --repository} $res]} { |
| 44 | 43 | puts stderr "Cannot run this test within an open checkout" |
| 45 | 44 | return |
| 46 | 45 | } |
| 47 | 46 | # |
| 48 | 47 |
| --- test/merge5.test | |
| +++ test/merge5.test | |
| @@ -37,11 +37,10 @@ | |
| 37 | test merge5-$testid 1 |
| 38 | } |
| 39 | } |
| 40 | |
| 41 | catch {exec $::fossilexe info} res |
| 42 | puts res=$res |
| 43 | if {![regexp {use --repository} $res]} { |
| 44 | puts stderr "Cannot run this test within an open checkout" |
| 45 | return |
| 46 | } |
| 47 | # |
| 48 |
| --- test/merge5.test | |
| +++ test/merge5.test | |
| @@ -37,11 +37,10 @@ | |
| 37 | test merge5-$testid 1 |
| 38 | } |
| 39 | } |
| 40 | |
| 41 | catch {exec $::fossilexe info} res |
| 42 | if {![regexp {use --repository} $res]} { |
| 43 | puts stderr "Cannot run this test within an open checkout" |
| 44 | return |
| 45 | } |
| 46 | # |
| 47 |
| --- test/merge_renames.test | ||
| +++ test/merge_renames.test | ||
| @@ -2,11 +2,10 @@ | ||
| 2 | 2 | # Tests for merging with renames |
| 3 | 3 | # |
| 4 | 4 | # |
| 5 | 5 | |
| 6 | 6 | catch {exec $::fossilexe info} res |
| 7 | -puts res=$res | |
| 8 | 7 | if {![regexp {use --repository} $res]} { |
| 9 | 8 | puts stderr "Cannot run this test within an open checkout" |
| 10 | 9 | return |
| 11 | 10 | } |
| 12 | 11 | |
| 13 | 12 |
| --- test/merge_renames.test | |
| +++ test/merge_renames.test | |
| @@ -2,11 +2,10 @@ | |
| 2 | # Tests for merging with renames |
| 3 | # |
| 4 | # |
| 5 | |
| 6 | catch {exec $::fossilexe info} res |
| 7 | puts res=$res |
| 8 | if {![regexp {use --repository} $res]} { |
| 9 | puts stderr "Cannot run this test within an open checkout" |
| 10 | return |
| 11 | } |
| 12 | |
| 13 |
| --- test/merge_renames.test | |
| +++ test/merge_renames.test | |
| @@ -2,11 +2,10 @@ | |
| 2 | # Tests for merging with renames |
| 3 | # |
| 4 | # |
| 5 | |
| 6 | catch {exec $::fossilexe info} res |
| 7 | if {![regexp {use --repository} $res]} { |
| 8 | puts stderr "Cannot run this test within an open checkout" |
| 9 | return |
| 10 | } |
| 11 | |
| 12 |
-1
| --- test/mv-rm.test | ||
| +++ test/mv-rm.test | ||
| @@ -17,11 +17,10 @@ | ||
| 17 | 17 | # |
| 18 | 18 | # MV / RM Commands |
| 19 | 19 | # |
| 20 | 20 | |
| 21 | 21 | catch {exec $::fossilexe info} res |
| 22 | -puts res=$res | |
| 23 | 22 | if {![regexp {use --repository} $res]} { |
| 24 | 23 | puts stderr "Cannot run this test within an open checkout" |
| 25 | 24 | return |
| 26 | 25 | } |
| 27 | 26 | |
| 28 | 27 |
| --- test/mv-rm.test | |
| +++ test/mv-rm.test | |
| @@ -17,11 +17,10 @@ | |
| 17 | # |
| 18 | # MV / RM Commands |
| 19 | # |
| 20 | |
| 21 | catch {exec $::fossilexe info} res |
| 22 | puts res=$res |
| 23 | if {![regexp {use --repository} $res]} { |
| 24 | puts stderr "Cannot run this test within an open checkout" |
| 25 | return |
| 26 | } |
| 27 | |
| 28 |
| --- test/mv-rm.test | |
| +++ test/mv-rm.test | |
| @@ -17,11 +17,10 @@ | |
| 17 | # |
| 18 | # MV / RM Commands |
| 19 | # |
| 20 | |
| 21 | catch {exec $::fossilexe info} res |
| 22 | if {![regexp {use --repository} $res]} { |
| 23 | puts stderr "Cannot run this test within an open checkout" |
| 24 | return |
| 25 | } |
| 26 | |
| 27 |
-1
| --- test/revert.test | ||
| +++ test/revert.test | ||
| @@ -38,11 +38,10 @@ | ||
| 38 | 38 | |
| 39 | 39 | fossil undo |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | catch {exec $::fossilexe info} res |
| 43 | -puts res=$res | |
| 44 | 43 | if {![regexp {use --repository} $res]} { |
| 45 | 44 | puts stderr "Cannot run this test within an open checkout" |
| 46 | 45 | return |
| 47 | 46 | } |
| 48 | 47 | |
| 49 | 48 |
| --- test/revert.test | |
| +++ test/revert.test | |
| @@ -38,11 +38,10 @@ | |
| 38 | |
| 39 | fossil undo |
| 40 | } |
| 41 | |
| 42 | catch {exec $::fossilexe info} res |
| 43 | puts res=$res |
| 44 | if {![regexp {use --repository} $res]} { |
| 45 | puts stderr "Cannot run this test within an open checkout" |
| 46 | return |
| 47 | } |
| 48 | |
| 49 |
| --- test/revert.test | |
| +++ test/revert.test | |
| @@ -38,11 +38,10 @@ | |
| 38 | |
| 39 | fossil undo |
| 40 | } |
| 41 | |
| 42 | catch {exec $::fossilexe info} res |
| 43 | if {![regexp {use --repository} $res]} { |
| 44 | puts stderr "Cannot run this test within an open checkout" |
| 45 | return |
| 46 | } |
| 47 | |
| 48 |
| --- www/checkin_names.wiki | ||
| +++ www/checkin_names.wiki | ||
| @@ -15,10 +15,11 @@ | ||
| 15 | 15 | <ul> |
| 16 | 16 | <li> <b>tip</b> |
| 17 | 17 | <li> <b>current</b> |
| 18 | 18 | <li> <b>next</b> |
| 19 | 19 | <li> <b>previous</b> or <b>prev</b> |
| 20 | +<li> <b>ckout</b> for embedded docs | |
| 20 | 21 | </ul> |
| 21 | 22 | </ul> |
| 22 | 23 | </td></tr> |
| 23 | 24 | </table> |
| 24 | 25 | Many Fossil [/help|commands] and [./webui.wiki | web-interface] URLs accept |
| @@ -216,10 +217,16 @@ | ||
| 216 | 217 | If the command is being run from a working check-out (not against a bare |
| 217 | 218 | repository) then a few extra tags apply. The "current" tag means the |
| 218 | 219 | current check-out. The "next" tag means the youngest child of the |
| 219 | 220 | current check-out. And the "previous" or "prev" tag means the primary |
| 220 | 221 | (non-merge) parent of the current check-out. |
| 222 | + | |
| 223 | +For embedded documentation, the tag "ckout" means the version as present in | |
| 224 | +the local source tree on disk, provided that the web server is started using | |
| 225 | +"fossil ui" or "fossil server" from within the source tree. This tag can be | |
| 226 | +used to preview local changes to documentation before committing them. It does | |
| 227 | +not apply to CLI commands. | |
| 221 | 228 | |
| 222 | 229 | <h2>Additional Examples</h2> |
| 223 | 230 | |
| 224 | 231 | To view the changes in the most recent check-in prior to the version currently |
| 225 | 232 | checked out: |
| 226 | 233 |
| --- www/checkin_names.wiki | |
| +++ www/checkin_names.wiki | |
| @@ -15,10 +15,11 @@ | |
| 15 | <ul> |
| 16 | <li> <b>tip</b> |
| 17 | <li> <b>current</b> |
| 18 | <li> <b>next</b> |
| 19 | <li> <b>previous</b> or <b>prev</b> |
| 20 | </ul> |
| 21 | </ul> |
| 22 | </td></tr> |
| 23 | </table> |
| 24 | Many Fossil [/help|commands] and [./webui.wiki | web-interface] URLs accept |
| @@ -216,10 +217,16 @@ | |
| 216 | If the command is being run from a working check-out (not against a bare |
| 217 | repository) then a few extra tags apply. The "current" tag means the |
| 218 | current check-out. The "next" tag means the youngest child of the |
| 219 | current check-out. And the "previous" or "prev" tag means the primary |
| 220 | (non-merge) parent of the current check-out. |
| 221 | |
| 222 | <h2>Additional Examples</h2> |
| 223 | |
| 224 | To view the changes in the most recent check-in prior to the version currently |
| 225 | checked out: |
| 226 |
| --- www/checkin_names.wiki | |
| +++ www/checkin_names.wiki | |
| @@ -15,10 +15,11 @@ | |
| 15 | <ul> |
| 16 | <li> <b>tip</b> |
| 17 | <li> <b>current</b> |
| 18 | <li> <b>next</b> |
| 19 | <li> <b>previous</b> or <b>prev</b> |
| 20 | <li> <b>ckout</b> for embedded docs |
| 21 | </ul> |
| 22 | </ul> |
| 23 | </td></tr> |
| 24 | </table> |
| 25 | Many Fossil [/help|commands] and [./webui.wiki | web-interface] URLs accept |
| @@ -216,10 +217,16 @@ | |
| 217 | If the command is being run from a working check-out (not against a bare |
| 218 | repository) then a few extra tags apply. The "current" tag means the |
| 219 | current check-out. The "next" tag means the youngest child of the |
| 220 | current check-out. And the "previous" or "prev" tag means the primary |
| 221 | (non-merge) parent of the current check-out. |
| 222 | |
| 223 | For embedded documentation, the tag "ckout" means the version as present in |
| 224 | the local source tree on disk, provided that the web server is started using |
| 225 | "fossil ui" or "fossil server" from within the source tree. This tag can be |
| 226 | used to preview local changes to documentation before committing them. It does |
| 227 | not apply to CLI commands. |
| 228 | |
| 229 | <h2>Additional Examples</h2> |
| 230 | |
| 231 | To view the changes in the most recent check-in prior to the version currently |
| 232 | checked out: |
| 233 |