Artifact a976664f21390761543dcd93b290bd9beed96667:
- File test/update-test-2.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: 1209) [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 32 2e 73 68 20 2f 68 6f 6d 65 -test-2.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 32 2e 66 6f 73 73 69 6c 0a 0a 23 20 est-2.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 32 2e 66 6f 73 73 69 6c 0a 0a 23 20 49 6e 20 -2.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 2e 0a d file one.txt.. 0150: 6d 6b 64 69 72 20 61 61 61 0a 63 64 20 61 61 61 mkdir aaa.cd aaa 0160: 0a 24 46 4f 53 53 49 4c 20 6f 70 65 6e 20 2e 2e .$FOSSIL open .. 0170: 2f 75 70 64 61 74 65 2d 74 65 73 74 2d 32 2e 66 /update-test-2.f 0180: 6f 73 73 69 6c 0a 65 63 68 6f 20 6f 6e 65 20 3e ossil.echo one > 0190: 6f 6e 65 2e 74 78 74 0a 24 46 4f 53 53 49 4c 20 one.txt.$FOSSIL 01a0: 61 64 64 20 6f 6e 65 2e 74 78 74 0a 24 46 4f 53 add one.txt.$FOS 01b0: 53 49 4c 20 63 6f 6d 6d 69 74 20 2d 6d 20 61 64 SIL commit -m ad 01c0: 64 2d 6f 6e 65 20 2d 2d 74 61 67 20 61 64 64 2d d-one --tag add- 01d0: 6f 6e 65 0a 0a 23 20 43 72 65 61 74 65 20 63 68 one..# Create ch 01e0: 65 63 6b 6f 75 74 20 62 62 62 2e 0a 6d 6b 64 69 eckout bbb..mkdi 01f0: 72 20 2e 2e 2f 62 62 62 0a 63 64 20 2e 2e 2f 62 r ../bbb.cd ../b 0200: 62 62 0a 24 46 4f 53 53 49 4c 20 6f 70 65 6e 20 bb.$FOSSIL open 0210: 2e 2e 2f 75 70 64 61 74 65 2d 74 65 73 74 2d 32 ../update-test-2 0220: 2e 66 6f 73 73 69 6c 0a 0a 23 20 42 61 63 6b 20 .fossil..# Back 0230: 69 6e 20 61 61 61 2c 20 6d 61 6b 65 20 63 68 61 in aaa, make cha 0240: 6e 67 65 73 20 74 6f 20 6f 6e 65 2e 74 78 74 2e nges to one.txt. 0250: 20 20 41 64 64 20 66 69 6c 65 20 74 77 6f 2e 74 Add file two.t 0260: 78 74 2e 0a 63 64 20 2e 2e 2f 61 61 61 0a 65 63 xt..cd ../aaa.ec 0270: 68 6f 20 63 68 61 6e 67 65 20 3e 3e 6f 6e 65 2e ho change >>one. 0280: 74 78 74 0a 65 63 68 6f 20 74 77 6f 20 3e 74 77 txt.echo two >tw 0290: 6f 2e 74 78 74 0a 24 46 4f 53 53 49 4c 20 61 64 o.txt.$FOSSIL ad 02a0: 64 20 74 77 6f 2e 74 78 74 0a 24 46 4f 53 53 49 d two.txt.$FOSSI 02b0: 4c 20 63 6f 6d 6d 69 74 20 2d 6d 20 27 63 68 6e L commit -m 'chn 02c0: 67 20 6f 6e 65 20 61 6e 64 20 61 64 64 20 74 77 g one and add tw 02d0: 6f 27 20 2d 2d 74 61 67 20 61 64 64 2d 74 77 6f o' --tag add-two 02e0: 0a 0a 23 20 49 6e 20 62 62 62 2c 20 72 65 6d 6f ..# In bbb, remo 02f0: 76 65 20 6f 6e 65 2e 74 78 74 2c 20 74 68 65 6e ve one.txt, then 0300: 20 75 70 64 61 74 65 2e 0a 63 64 20 2e 2e 2f 62 update..cd ../b 0310: 62 62 0a 24 46 4f 53 53 49 4c 20 72 6d 20 6f 6e bb.$FOSSIL rm on 0320: 65 2e 74 78 74 0a 24 46 4f 53 53 49 4c 20 63 68 e.txt.$FOSSIL ch 0330: 61 6e 67 65 73 0a 65 63 68 6f 20 27 3d 3d 3d 3d anges.echo '==== 0340: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================ 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 27 0a 24 46 4f 53 53 49 4c 20 75 70 ===='.$FOSSIL up 0390: 64 61 74 65 0a 65 63 68 6f 20 27 3d 3d 3d 3d 3d date.echo '===== 03a0: 3d 3d 3d 20 50 72 65 76 69 6f 75 73 20 73 68 6f === Previous sho 03b0: 75 6c 64 20 73 68 6f 77 20 22 41 44 44 20 74 77 uld show "ADD tw 03c0: 6f 2e 74 78 74 22 20 61 6e 64 20 63 6f 6e 66 6c o.txt" and confl 03d0: 69 63 74 20 6f 6e 20 6f 6e 65 2e 74 78 74 20 3d ict on one.txt = 03e0: 3d 3d 3d 27 0a 24 46 4f 53 53 49 4c 20 63 68 61 ==='.$FOSSIL cha 03f0: 6e 67 65 73 0a 65 63 68 6f 20 27 3d 3d 3d 3d 3d nges.echo '===== 0400: 3d 3d 3d 20 54 68 65 20 70 72 65 76 69 6f 75 73 === The previous 0410: 20 73 68 6f 75 6c 64 20 73 68 6f 77 20 22 44 45 should show "DE 0420: 4c 45 54 45 20 6f 6e 65 2e 74 78 74 22 20 3d 3d LETE one.txt" == 0430: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================ 0440: 3d 3d 3d 27 0a 24 46 4f 53 53 49 4c 20 63 6f 6d ==='.$FOSSIL com 0450: 6d 69 74 20 2d 2d 74 65 73 74 20 2d 6d 20 27 63 mit --test -m 'c 0460: 68 65 63 6b 2d 69 6e 27 0a 65 63 68 6f 20 27 3d heck-in'.echo '= 0470: 3d 3d 3d 3d 3d 3d 3d 20 4f 6e 6c 79 20 66 69 6c ======= Only fil 0480: 65 20 74 77 6f 2e 74 78 74 20 69 73 20 63 68 65 e two.txt is che 0490: 63 6b 65 64 20 69 6e 20 3d 3d 3d 3d 3d 3d 3d 3d cked in ======== 04a0: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================ 04b0: 3d 3d 3d 3d 3d 3d 3d 27 0a ======='.