Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Merge updates from trunk. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | ckol-th1-dir-cmd |
| Files: | files | file ages | folders |
| SHA1: |
e4db8fe84f5d547c94079a32c36ac465 |
| User & Date: | mistachkin 2015-08-15 18:48:36 |
Context
|
2015-08-18
| ||
| 07:49 | Add support for optional per-file details in the TH1 dir cmd, using a list-of-lists. check-in: 83f50997 user: mistachkin tags: ckol-th1-dir-cmd | |
|
2015-08-15
| ||
| 18:48 | Merge updates from trunk. check-in: e4db8fe8 user: mistachkin tags: ckol-th1-dir-cmd | |
| 18:48 | Remove stray debugging output in tests. check-in: 5fdf670f user: mistachkin tags: trunk | |
| 18:47 | Restore read-only TH1 tests to their original file. Coding style fixes in tests. Add 'dir' command to the expected command list test. check-in: 25e9c00b user: mistachkin tags: ckol-th1-dir-cmd | |
Changes
Changes to test/merge5.test.
35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 |
test merge5-$testid 0
} else {
test merge5-$testid 1
}
}
catch {exec $::fossilexe info} res
puts res=$res
if {![regexp {use --repository} $res]} {
puts stderr "Cannot run this test within an open checkout"
return
}
#
# Fossil will write data on $HOME, running 'fossil open' here.
# We need not to clutter the $HOME of the test caller.
|
< |
35 36 37 38 39 40 41 42 43 44 45 46 47 48 |
test merge5-$testid 0
} else {
test merge5-$testid 1
}
}
catch {exec $::fossilexe info} res
if {![regexp {use --repository} $res]} {
puts stderr "Cannot run this test within an open checkout"
return
}
#
# Fossil will write data on $HOME, running 'fossil open' here.
# We need not to clutter the $HOME of the test caller.
|
Changes to test/merge_renames.test.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 |
#
# Tests for merging with renames
#
#
catch {exec $::fossilexe info} res
puts res=$res
if {![regexp {use --repository} $res]} {
puts stderr "Cannot run this test within an open checkout"
return
}
######################################
# Test 1 #
|
< |
1 2 3 4 5 6 7 8 9 10 11 12 13 |
#
# Tests for merging with renames
#
#
catch {exec $::fossilexe info} res
if {![regexp {use --repository} $res]} {
puts stderr "Cannot run this test within an open checkout"
return
}
######################################
# Test 1 #
|
Changes to test/mv-rm.test.
15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 |
#
############################################################################
#
# MV / RM Commands
#
catch {exec $::fossilexe info} res
puts res=$res
if {![regexp {use --repository} $res]} {
puts stderr "Cannot run this test within an open checkout"
return
}
########################################
# Setup: Add Files and Commit #
|
< |
15 16 17 18 19 20 21 22 23 24 25 26 27 28 |
#
############################################################################
#
# MV / RM Commands
#
catch {exec $::fossilexe info} res
if {![regexp {use --repository} $res]} {
puts stderr "Cannot run this test within an open checkout"
return
}
########################################
# Setup: Add Files and Commit #
|
Changes to test/revert.test.
36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 |
test revert-$testid$key $passed
}
fossil undo
}
catch {exec $::fossilexe info} res
puts res=$res
if {![regexp {use --repository} $res]} {
puts stderr "Cannot run this test within an open checkout"
return
}
repo_init
|
< |
36 37 38 39 40 41 42 43 44 45 46 47 48 49 |
test revert-$testid$key $passed
}
fossil undo
}
catch {exec $::fossilexe info} res
if {![regexp {use --repository} $res]} {
puts stderr "Cannot run this test within an open checkout"
return
}
repo_init
|
Changes to www/checkin_names.wiki.
13
14
15
16
17
18
19
20
21
22
23
24
25
26
...
214
215
216
217
218
219
220
221
222
223
224
225
226
227
|
<li> <b>root :</b> <i>branchname</i>
<li> Special names:
<ul>
<li> <b>tip</b>
<li> <b>current</b>
<li> <b>next</b>
<li> <b>previous</b> or <b>prev</b>
</ul>
</ul>
</td></tr>
</table>
Many Fossil [/help|commands] and [./webui.wiki | web-interface] URLs accept
check-in names as an argument. For example, the "[/help/info|info]" command
accepts an optional check-in name to identify the specific checkout
................................................................................
equivalent to the timestamp tag "5000-01-01".
If the command is being run from a working check-out (not against a bare
repository) then a few extra tags apply. The "current" tag means the
current check-out. The "next" tag means the youngest child of the
current check-out. And the "previous" or "prev" tag means the primary
(non-merge) parent of the current check-out.
<h2>Additional Examples</h2>
To view the changes in the most recent check-in prior to the version currently
checked out:
<blockquote><pre>
|
>
>
>
>
>
>
>
|
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
...
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
|
<li> <b>root :</b> <i>branchname</i> <li> Special names: <ul> <li> <b>tip</b> <li> <b>current</b> <li> <b>next</b> <li> <b>previous</b> or <b>prev</b> <li> <b>ckout</b> for embedded docs </ul> </ul> </td></tr> </table> Many Fossil [/help|commands] and [./webui.wiki | web-interface] URLs accept check-in names as an argument. For example, the "[/help/info|info]" command accepts an optional check-in name to identify the specific checkout ................................................................................ equivalent to the timestamp tag "5000-01-01". If the command is being run from a working check-out (not against a bare repository) then a few extra tags apply. The "current" tag means the current check-out. The "next" tag means the youngest child of the current check-out. And the "previous" or "prev" tag means the primary (non-merge) parent of the current check-out. For embedded documentation, the tag "ckout" means the version as present in the local source tree on disk, provided that the web server is started using "fossil ui" or "fossil server" from within the source tree. This tag can be used to preview local changes to documentation before committing them. It does not apply to CLI commands. <h2>Additional Examples</h2> To view the changes in the most recent check-in prior to the version currently checked out: <blockquote><pre> |