Artifact 6812a27babef50e8888641f52936a7db3d3c9d6f:
- File test/update-test-1.sh — part of check-in [28272fa125] at 2012-11-06 19:42:30 on branch trunk — Make sure that pending deletes from "fossil rm" operations are preserved across a "fossil update". (user: drh size: 1222) [more...]
0000: 23 21 2f 62 69 6e 2f 73 68 0a 23 0a 23 20 52 75 #!/bin/sh.#.# Ru 0010: 6e 20 74 68 69 73 20 73 63 72 69 70 74 20 69 6e n this script in 0020: 20 61 6e 20 65 6d 70 74 79 20 64 69 72 65 63 74 an empty direct 0030: 6f 72 79 2e 20 20 41 20 73 69 6e 67 6c 65 20 61 ory. A single a 0040: 72 67 75 6d 65 6e 74 20 69 73 20 74 68 65 20 66 rgument is the f 0050: 75 6c 6c 0a 23 20 70 61 74 68 6e 61 6d 65 20 6f ull.# pathname o 0060: 66 20 74 68 65 20 66 6f 73 73 69 6c 20 62 69 6e f the fossil bin 0070: 61 72 79 2e 20 20 45 78 61 6d 70 6c 65 3a 0a 23 ary. Example:.# 0080: 0a 23 20 20 20 20 20 73 68 20 75 70 64 61 74 65 .# sh update 0090: 2d 74 65 73 74 2d 31 2e 73 68 20 2f 68 6f 6d 65 -test-1.sh /home 00a0: 2f 64 72 68 2f 66 6f 73 73 69 6c 2f 6d 31 2f 66 /drh/fossil/m1/f 00b0: 6f 73 73 69 6c 0a 23 0a 65 78 70 6f 72 74 20 46 ossil.#.export F 00c0: 4f 53 53 49 4c 3d 24 31 0a 72 6d 20 2d 72 66 20 OSSIL=$1.rm -rf 00d0: 61 61 61 20 62 62 62 20 75 70 64 61 74 65 2d 74 aaa bbb update-t 00e0: 65 73 74 2d 31 2e 66 6f 73 73 69 6c 0a 0a 23 20 est-1.fossil..# 00f0: 43 72 65 61 74 65 20 61 20 74 65 73 74 20 72 65 Create a test re 0100: 70 6f 73 69 74 6f 72 79 0a 24 46 4f 53 53 49 4c pository.$FOSSIL 0110: 20 6e 65 77 20 75 70 64 61 74 65 2d 74 65 73 74 new update-test 0120: 2d 31 2e 66 6f 73 73 69 6c 0a 0a 23 20 49 6e 20 -1.fossil..# In 0130: 63 68 65 63 6b 6f 75 74 20 61 61 61 2c 20 61 64 checkout aaa, ad 0140: 64 20 66 69 6c 65 20 6f 6e 65 2e 74 78 74 0a 6d d file one.txt.m 0150: 6b 64 69 72 20 61 61 61 0a 63 64 20 61 61 61 0a kdir aaa.cd aaa. 0160: 24 46 4f 53 53 49 4c 20 6f 70 65 6e 20 2e 2e 2f $FOSSIL open ../ 0170: 75 70 64 61 74 65 2d 74 65 73 74 2d 31 2e 66 6f update-test-1.fo 0180: 73 73 69 6c 0a 65 63 68 6f 20 6f 6e 65 20 3e 6f ssil.echo one >o 0190: 6e 65 2e 74 78 74 0a 24 46 4f 53 53 49 4c 20 61 ne.txt.$FOSSIL a 01a0: 64 64 20 6f 6e 65 2e 74 78 74 0a 24 46 4f 53 53 dd one.txt.$FOSS 01b0: 49 4c 20 63 6f 6d 6d 69 74 20 2d 6d 20 61 64 64 IL commit -m add 01c0: 2d 6f 6e 65 20 2d 2d 74 61 67 20 61 64 64 2d 6f -one --tag add-o 01d0: 6e 65 0a 0a 23 20 4f 70 65 6e 20 63 68 65 63 6b ne..# Open check 01e0: 6f 75 74 20 62 62 62 2e 0a 6d 6b 64 69 72 20 2e out bbb..mkdir . 01f0: 2e 2f 62 62 62 0a 63 64 20 2e 2e 2f 62 62 62 0a ./bbb.cd ../bbb. 0200: 24 46 4f 53 53 49 4c 20 6f 70 65 6e 20 2e 2e 2f $FOSSIL open ../ 0210: 75 70 64 61 74 65 2d 74 65 73 74 2d 31 2e 66 6f update-test-1.fo 0220: 73 73 69 6c 0a 0a 23 20 42 61 63 6b 20 69 6e 20 ssil..# Back in 0230: 61 61 61 2c 20 61 64 64 20 66 69 6c 65 20 74 77 aaa, add file tw 0240: 6f 2e 74 78 74 0a 63 64 20 2e 2e 2f 61 61 61 0a o.txt.cd ../aaa. 0250: 65 63 68 6f 20 74 77 6f 20 3e 74 77 6f 2e 74 78 echo two >two.tx 0260: 74 0a 24 46 4f 53 53 49 4c 20 61 64 64 20 74 77 t.$FOSSIL add tw 0270: 6f 2e 74 78 74 0a 24 46 4f 53 53 49 4c 20 63 6f o.txt.$FOSSIL co 0280: 6d 6d 69 74 20 2d 6d 20 61 64 64 2d 74 77 6f 20 mmit -m add-two 0290: 2d 2d 74 61 67 20 61 64 64 2d 74 77 6f 0a 0a 23 --tag add-two..# 02a0: 20 49 6e 20 62 62 62 2c 20 64 65 6c 65 74 65 20 In bbb, delete 02b0: 66 69 6c 65 20 6f 6e 65 2e 74 78 74 2e 20 20 54 file one.txt. T 02c0: 68 65 6e 20 75 70 64 61 74 65 20 74 68 65 20 63 hen update the c 02d0: 68 61 6e 67 65 20 66 72 6f 6d 20 61 61 61 20 74 hange from aaa t 02e0: 68 61 74 0a 23 20 61 64 64 73 20 66 69 6c 65 20 hat.# adds file 02f0: 74 77 6f 2e 20 20 56 65 72 69 66 79 20 74 68 61 two. Verify tha 0300: 74 20 6f 6e 65 2e 74 78 74 20 73 61 79 73 20 64 t one.txt says d 0310: 65 6c 65 74 65 64 2e 0a 63 64 20 2e 2e 2f 62 62 eleted..cd ../bb 0320: 62 0a 24 46 4f 53 53 49 4c 20 72 6d 20 6f 6e 65 b.$FOSSIL rm one 0330: 2e 74 78 74 0a 24 46 4f 53 53 49 4c 20 63 68 61 .txt.$FOSSIL cha 0340: 6e 67 65 73 0a 65 63 68 6f 20 27 3d 3d 3d 3d 3d nges.echo '===== 0350: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================ 0360: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================ 0370: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================ 0380: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================ 0390: 3d 3d 3d 27 0a 24 46 4f 53 53 49 4c 20 75 70 64 ==='.$FOSSIL upd 03a0: 61 74 65 0a 65 63 68 6f 20 27 3d 3d 3d 3d 3d 3d ate.echo '====== 03b0: 3d 3d 20 54 68 65 20 70 72 65 76 69 6f 75 73 20 == The previous 03c0: 73 68 6f 75 6c 64 20 73 68 6f 77 20 22 41 44 44 should show "ADD 03d0: 20 74 77 6f 2e 74 78 74 22 20 3d 3d 3d 3d 3d 3d two.txt" ====== 03e0: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================ 03f0: 3d 3d 27 0a 24 46 4f 53 53 49 4c 20 63 68 61 6e =='.$FOSSIL chan 0400: 67 65 73 0a 65 63 68 6f 20 27 3d 3d 3d 3d 3d 3d ges.echo '====== 0410: 3d 3d 20 54 68 65 20 70 72 65 76 69 6f 75 73 20 == The previous 0420: 73 68 6f 75 6c 64 20 73 68 6f 77 20 22 44 45 4c should show "DEL 0430: 45 54 45 20 6f 6e 65 2e 74 78 74 22 20 3d 3d 3d ETE one.txt" === 0440: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================ 0450: 3d 3d 27 0a 24 46 4f 53 53 49 4c 20 63 6f 6d 6d =='.$FOSSIL comm 0460: 69 74 20 2d 2d 74 65 73 74 20 2d 6d 20 63 68 65 it --test -m che 0470: 63 6b 2d 69 6e 0a 65 63 68 6f 20 27 3d 3d 3d 3d ck-in.echo '==== 0480: 3d 3d 3d 3d 20 4f 6e 6c 79 20 66 69 6c 65 20 74 ==== Only file t 0490: 77 6f 2e 74 78 74 20 69 73 20 63 68 65 63 6b 65 wo.txt is checke 04a0: 64 20 69 6e 20 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d d in =========== 04b0: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================ 04c0: 3d 3d 3d 3d 27 0a ===='.