Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Partially backout [bf9669f5]. Leave whitespace alone in test files |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
6a3e2ed87eff4090e8759bf662ec4c5f |
| User & Date: | andygoth 2016-11-07 01:32:36 |
Context
|
2016-11-07
| ||
| 01:48 | Add crlf-glob to tester.tcl (check-in: e754cad9 user: andygoth tags: trunk) | |
| 01:32 | Partially backout [bf9669f5]. Leave whitespace alone in test files (check-in: 6a3e2ed8 user: andygoth tags: trunk) | |
| 01:29 | Remove some tabs and end-of-line whitespace (check-in: bf9669f5 user: andygoth tags: trunk) | |
Changes
Changes to test/diff-test-1.wiki.
1 2 3 4 5 6 7 8 9 10 11 |
<title>Graph Test One</title>
This page contains list of URLs of interesting diffs.
Click on all URLs, one by one, to verify
the correct operation of the diff logic.
* <a href="../../../info/030035345c#chunk73" target="testwindow">
Multiple edits on a single line.</a> This is an SQLite version
update diff. It is a large diff and contains many other interesting
features. Scan the whole diff.
* <a href="../../../fdiff?v1=6da016415dc52d61&v2=af6df3466e3c4a88"
|
| |
1 2 3 4 5 6 7 8 9 10 11 |
<title>Graph Test One</title>
This page contains list of URLs of interesting diffs.
Click on all URLs, one by one, to verify
the correct operation of the diff logic.
* <a href="../../../info/030035345c#chunk73" target="testwindow">
Multiple edits on a single line.</a> This is an SQLite version
update diff. It is a large diff and contains many other interesting
features. Scan the whole diff.
* <a href="../../../fdiff?v1=6da016415dc52d61&v2=af6df3466e3c4a88"
|
Changes to test/merge1.test.
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
...
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
|
fossil 3-way-merge t1 t2 t3 a23
test merge1-7.1 {[same_file t23 a23]}
write_file_indented t2 {
abcd
efgh 2
ijkl 2
mnop
qrst
uvwx
yzAB 2
CDEF 2
GHIJ 2
KLMN
OPQR
................................................................................
XYZ.
}
write_file_indented t23 {
abcd
<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<<
efgh 2
ijkl 2
mnop
qrst
uvwx
yzAB 2
CDEF 2
GHIJ 2
======= COMMON ANCESTOR content follows ============================
efgh
|
|
|
|
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
...
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
|
fossil 3-way-merge t1 t2 t3 a23
test merge1-7.1 {[same_file t23 a23]}
write_file_indented t2 {
abcd
efgh 2
ijkl 2
mnop
qrst
uvwx
yzAB 2
CDEF 2
GHIJ 2
KLMN
OPQR
................................................................................
XYZ.
}
write_file_indented t23 {
abcd
<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<<
efgh 2
ijkl 2
mnop
qrst
uvwx
yzAB 2
CDEF 2
GHIJ 2
======= COMMON ANCESTOR content follows ============================
efgh
|
Changes to test/merge3.test.
293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 |
merge-test 43 {
2 3 4 5 6 7 8
} {
6 7 8
} {
2 3 4 5
} {
}
merge-test 44 {
2 3 4 5 6 7 8
} {
6 7 8
} {
2 3 4
|
| |
293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 |
merge-test 43 {
2 3 4 5 6 7 8
} {
6 7 8
} {
2 3 4 5
} {
}
merge-test 44 {
2 3 4 5 6 7 8
} {
6 7 8
} {
2 3 4
|
Changes to test/merge5.test.
31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 |
regsub -all {\n *} [string trim $RESULT] "\n " result
if {$result!=$expected} {
protOut " Expected:\n $expected"
protOut " Got:\n $result"
test merge5-$testid 0
} else {
test merge5-$testid 1
}
}
require_no_open_checkout; test_setup ""
# Construct a test repository
#
exec $::fossilexe sqlite3 --no-repository m5.fossil <$testdir/${testfile}_repo.sql
|
| |
31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 |
regsub -all {\n *} [string trim $RESULT] "\n " result
if {$result!=$expected} {
protOut " Expected:\n $expected"
protOut " Got:\n $result"
test merge5-$testid 0
} else {
test merge5-$testid 1
}
}
require_no_open_checkout; test_setup ""
# Construct a test repository
#
exec $::fossilexe sqlite3 --no-repository m5.fossil <$testdir/${testfile}_repo.sql
|
Changes to test/revert.test.
13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 |
# drh@hwaci.com
# http://www.hwaci.com/drh/
#
############################################################################
#
#
# Tests for 'fossil revert'
#
#
# Test 'fossil revert' against expected results from 'fossil changes' and
# 'fossil addremove -n', as well as by verifying the existence of files
# on the file system. 'fossil undo' is called after each test
#
proc revert-test {testid revertArgs expectedRevertOutput args} {
|
| |
13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 |
# drh@hwaci.com
# http://www.hwaci.com/drh/
#
############################################################################
#
#
# Tests for 'fossil revert'
#
#
# Test 'fossil revert' against expected results from 'fossil changes' and
# 'fossil addremove -n', as well as by verifying the existence of files
# on the file system. 'fossil undo' is called after each test
#
proc revert-test {testid revertArgs expectedRevertOutput args} {
|