3 c84d8c75 2019-01-02 stsp # Copyright (c) 2019 Stefan Sperling <stsp@openbsd.org>
5 c84d8c75 2019-01-02 stsp # Permission to use, copy, modify, and distribute this software for any
6 c84d8c75 2019-01-02 stsp # purpose with or without fee is hereby granted, provided that the above
7 c84d8c75 2019-01-02 stsp # copyright notice and this permission notice appear in all copies.
9 c84d8c75 2019-01-02 stsp # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 c84d8c75 2019-01-02 stsp # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 c84d8c75 2019-01-02 stsp # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 c84d8c75 2019-01-02 stsp # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 c84d8c75 2019-01-02 stsp # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 c84d8c75 2019-01-02 stsp # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 c84d8c75 2019-01-02 stsp # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 c84d8c75 2019-01-02 stsp . ./common.sh
19 f6cae3ed 2020-09-13 naddy test_update_basic() {
20 0fbd721f 2019-01-02 stsp local testroot=`test_init update_basic`
22 3c90ba67 2019-01-02 stsp got checkout $testroot/repo $testroot/wt > /dev/null
24 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
25 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
29 c84d8c75 2019-01-02 stsp echo "modified alpha" > $testroot/repo/alpha
30 c84d8c75 2019-01-02 stsp git_commit $testroot/repo -m "modified alpha"
32 c84d8c75 2019-01-02 stsp echo "U alpha" > $testroot/stdout.expected
33 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
34 9c4b8182 2019-01-02 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
35 9c4b8182 2019-01-02 stsp echo >> $testroot/stdout.expected
37 c84d8c75 2019-01-02 stsp (cd $testroot/wt && got update > $testroot/stdout)
39 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
41 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
42 c84d8c75 2019-01-02 stsp diff -u $testroot/stdout.expected $testroot/stdout
43 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
47 c84d8c75 2019-01-02 stsp echo "modified alpha" > $testroot/content.expected
48 52a3df9b 2019-01-06 stsp cat $testroot/wt/alpha > $testroot/content
50 8d301dd9 2019-05-14 stsp cmp -s $testroot/content.expected $testroot/content
52 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
53 c84d8c75 2019-01-02 stsp diff -u $testroot/content.expected $testroot/content
55 693719bc 2019-01-03 stsp test_done "$testroot" "$ret"
58 f6cae3ed 2020-09-13 naddy test_update_adds_file() {
59 3b4d3732 2019-01-02 stsp local testroot=`test_init update_adds_file`
61 3b4d3732 2019-01-02 stsp got checkout $testroot/repo $testroot/wt > /dev/null
63 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
64 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
68 3b4d3732 2019-01-02 stsp echo "new" > $testroot/repo/gamma/new
69 3b4d3732 2019-01-02 stsp (cd $testroot/repo && git add .)
70 3b4d3732 2019-01-02 stsp git_commit $testroot/repo -m "adding a new file"
72 3b4d3732 2019-01-02 stsp echo "A gamma/new" > $testroot/stdout.expected
73 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
74 3b4d3732 2019-01-02 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
75 3b4d3732 2019-01-02 stsp echo >> $testroot/stdout.expected
77 3b4d3732 2019-01-02 stsp (cd $testroot/wt && got update > $testroot/stdout)
79 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
81 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
82 3b4d3732 2019-01-02 stsp diff -u $testroot/stdout.expected $testroot/stdout
83 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
87 3b4d3732 2019-01-02 stsp echo "new" >> $testroot/content.expected
88 52a3df9b 2019-01-06 stsp cat $testroot/wt/gamma/new > $testroot/content
90 8d301dd9 2019-05-14 stsp cmp -s $testroot/content.expected $testroot/content
92 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
93 3b4d3732 2019-01-02 stsp diff -u $testroot/content.expected $testroot/content
95 693719bc 2019-01-03 stsp test_done "$testroot" "$ret"
98 f6cae3ed 2020-09-13 naddy test_update_deletes_file() {
99 512f0d0e 2019-01-02 stsp local testroot=`test_init update_deletes_file`
101 1c4cdd89 2021-06-20 stsp mkdir $testroot/wtparent
102 1c4cdd89 2021-06-20 stsp got checkout $testroot/repo $testroot/wtparent/wt > /dev/null
104 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
105 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
109 512f0d0e 2019-01-02 stsp (cd $testroot/repo && git_rm $testroot/repo beta)
110 512f0d0e 2019-01-02 stsp git_commit $testroot/repo -m "deleting a file"
112 512f0d0e 2019-01-02 stsp echo "D beta" > $testroot/stdout.expected
113 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
114 512f0d0e 2019-01-02 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
115 512f0d0e 2019-01-02 stsp echo >> $testroot/stdout.expected
117 1c4cdd89 2021-06-20 stsp # verify that no error occurs if the work tree's parent
118 1c4cdd89 2021-06-20 stsp # directory is not writable
119 1c4cdd89 2021-06-20 stsp chmod u-w $testroot/wtparent
120 1c4cdd89 2021-06-20 stsp (cd $testroot/wtparent/wt && got update > $testroot/stdout)
121 1c4cdd89 2021-06-20 stsp chmod u+w $testroot/wtparent
123 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
125 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
126 512f0d0e 2019-01-02 stsp diff -u $testroot/stdout.expected $testroot/stdout
127 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
131 1c4cdd89 2021-06-20 stsp if [ -e $testroot/wtparent/wt/beta ]; then
132 512f0d0e 2019-01-02 stsp echo "removed file beta still exists on disk" >&2
133 52a3df9b 2019-01-06 stsp test_done "$testroot" "1"
137 52a3df9b 2019-01-06 stsp test_done "$testroot" "0"
140 f6cae3ed 2020-09-13 naddy test_update_deletes_dir() {
141 f5c49f82 2019-01-06 stsp local testroot=`test_init update_deletes_dir`
143 f5c49f82 2019-01-06 stsp got checkout $testroot/repo $testroot/wt > /dev/null
145 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
146 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
150 f5c49f82 2019-01-06 stsp (cd $testroot/repo && git_rm $testroot/repo -r epsilon)
151 f5c49f82 2019-01-06 stsp git_commit $testroot/repo -m "deleting a directory"
153 f5c49f82 2019-01-06 stsp echo "D epsilon/zeta" > $testroot/stdout.expected
154 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
155 f5c49f82 2019-01-06 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
156 f5c49f82 2019-01-06 stsp echo >> $testroot/stdout.expected
158 f5c49f82 2019-01-06 stsp (cd $testroot/wt && got update > $testroot/stdout)
160 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
162 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
163 f5c49f82 2019-01-06 stsp diff -u $testroot/stdout.expected $testroot/stdout
164 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
168 f5c49f82 2019-01-06 stsp if [ -e $testroot/wt/epsilon ]; then
169 f5c49f82 2019-01-06 stsp echo "removed dir epsilon still exists on disk" >&2
170 52a3df9b 2019-01-06 stsp test_done "$testroot" "1"
174 52a3df9b 2019-01-06 stsp test_done "$testroot" "0"
177 f6cae3ed 2020-09-13 naddy test_update_deletes_dir_with_path_prefix() {
178 5cc266ba 2019-01-06 stsp local testroot=`test_init update_deletes_dir_with_path_prefix`
179 5cc266ba 2019-01-06 stsp local first_rev=`git_show_head $testroot/repo`
181 5cc266ba 2019-01-06 stsp mkdir $testroot/repo/epsilon/psi
182 5cc266ba 2019-01-06 stsp echo mu > $testroot/repo/epsilon/psi/mu
183 5cc266ba 2019-01-06 stsp (cd $testroot/repo && git add .)
184 5cc266ba 2019-01-06 stsp git_commit $testroot/repo -m "adding a sub-directory beneath epsilon"
186 5cc266ba 2019-01-06 stsp # check out the epsilon/ sub-tree
187 5cc266ba 2019-01-06 stsp got checkout -p epsilon $testroot/repo $testroot/wt > /dev/null
189 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
190 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
194 5cc266ba 2019-01-06 stsp # update back to first commit and expect psi/mu to be deleted
195 5cc266ba 2019-01-06 stsp echo "D psi/mu" > $testroot/stdout.expected
196 4f3c844b 2021-09-14 stsp echo "Updated to refs/heads/master: $first_rev" \
197 4f3c844b 2021-09-14 stsp >> $testroot/stdout.expected
199 5cc266ba 2019-01-06 stsp (cd $testroot/wt && got update -c $first_rev > $testroot/stdout)
201 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
203 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
204 5cc266ba 2019-01-06 stsp diff -u $testroot/stdout.expected $testroot/stdout
205 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
209 5cc266ba 2019-01-06 stsp if [ -e $testroot/wt/psi ]; then
210 5cc266ba 2019-01-06 stsp echo "removed dir psi still exists on disk" >&2
211 5cc266ba 2019-01-06 stsp test_done "$testroot" "1"
215 52a3df9b 2019-01-06 stsp test_done "$testroot" "0"
218 f6cae3ed 2020-09-13 naddy test_update_deletes_dir_recursively() {
219 90285c3b 2019-01-08 stsp local testroot=`test_init update_deletes_dir_recursively`
220 90285c3b 2019-01-08 stsp local first_rev=`git_show_head $testroot/repo`
222 90285c3b 2019-01-08 stsp mkdir $testroot/repo/epsilon/psi
223 90285c3b 2019-01-08 stsp echo mu > $testroot/repo/epsilon/psi/mu
224 90285c3b 2019-01-08 stsp mkdir $testroot/repo/epsilon/psi/chi
225 90285c3b 2019-01-08 stsp echo tau > $testroot/repo/epsilon/psi/chi/tau
226 90285c3b 2019-01-08 stsp (cd $testroot/repo && git add .)
227 90285c3b 2019-01-08 stsp git_commit $testroot/repo -m "adding a sub-directory beneath epsilon"
229 90285c3b 2019-01-08 stsp # check out the epsilon/ sub-tree
230 90285c3b 2019-01-08 stsp got checkout -p epsilon $testroot/repo $testroot/wt > /dev/null
232 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
233 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
237 90285c3b 2019-01-08 stsp # update back to first commit and expect psi/mu to be deleted
238 90285c3b 2019-01-08 stsp echo "D psi/chi/tau" > $testroot/stdout.expected
239 90285c3b 2019-01-08 stsp echo "D psi/mu" >> $testroot/stdout.expected
240 4f3c844b 2021-09-14 stsp echo "Updated to refs/heads/master: $first_rev" \
241 4f3c844b 2021-09-14 stsp >> $testroot/stdout.expected
243 90285c3b 2019-01-08 stsp (cd $testroot/wt && got update -c $first_rev > $testroot/stdout)
245 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
247 90285c3b 2019-01-08 stsp if [ "$?" != "0" ]; then
248 90285c3b 2019-01-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
249 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
253 90285c3b 2019-01-08 stsp if [ -e $testroot/wt/psi ]; then
254 90285c3b 2019-01-08 stsp echo "removed dir psi still exists on disk" >&2
255 90285c3b 2019-01-08 stsp test_done "$testroot" "1"
259 90285c3b 2019-01-08 stsp test_done "$testroot" "0"
262 f6cae3ed 2020-09-13 naddy test_update_sibling_dirs_with_common_prefix() {
263 4482e97b 2019-01-08 stsp local testroot=`test_init update_sibling_dirs_with_common_prefix`
265 81a30460 2019-01-08 stsp got checkout $testroot/repo $testroot/wt > /dev/null
267 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
268 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
272 81a30460 2019-01-08 stsp mkdir $testroot/repo/epsilon2
273 81a30460 2019-01-08 stsp echo mu > $testroot/repo/epsilon2/mu
274 81a30460 2019-01-08 stsp (cd $testroot/repo && git add epsilon2/mu)
275 81a30460 2019-01-08 stsp git_commit $testroot/repo -m "adding sibling of epsilon"
276 81a30460 2019-01-08 stsp echo change > $testroot/repo/epsilon/zeta
277 81a30460 2019-01-08 stsp git_commit $testroot/repo -m "changing epsilon/zeta"
279 81a30460 2019-01-08 stsp echo "U epsilon/zeta" > $testroot/stdout.expected
280 81a30460 2019-01-08 stsp echo "A epsilon2/mu" >> $testroot/stdout.expected
281 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
282 81a30460 2019-01-08 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
283 81a30460 2019-01-08 stsp echo >> $testroot/stdout.expected
285 81a30460 2019-01-08 stsp (cd $testroot/wt && got update > $testroot/stdout)
287 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
289 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
290 81a30460 2019-01-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
291 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
295 81a30460 2019-01-08 stsp echo "another change" > $testroot/repo/epsilon/zeta
296 81a30460 2019-01-08 stsp git_commit $testroot/repo -m "changing epsilon/zeta again"
298 81a30460 2019-01-08 stsp echo "U epsilon/zeta" > $testroot/stdout.expected
299 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
300 81a30460 2019-01-08 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
301 81a30460 2019-01-08 stsp echo >> $testroot/stdout.expected
303 81a30460 2019-01-08 stsp # Bug: This update used to do delete/add epsilon2/mu again:
304 81a30460 2019-01-08 stsp # U epsilon/zeta
305 81a30460 2019-01-08 stsp # D epsilon2/mu <--- not intended
306 81a30460 2019-01-08 stsp # A epsilon2/mu <--- not intended
307 50952927 2019-01-12 stsp (cd $testroot/wt && got update > $testroot/stdout)
309 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
311 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
312 50952927 2019-01-12 stsp diff -u $testroot/stdout.expected $testroot/stdout
313 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
317 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
319 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
320 50952927 2019-01-12 stsp diff -u $testroot/stdout.expected $testroot/stdout
322 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
325 f6cae3ed 2020-09-13 naddy test_update_dir_with_dot_sibling() {
326 50952927 2019-01-12 stsp local testroot=`test_init update_dir_with_dot_sibling`
328 50952927 2019-01-12 stsp got checkout $testroot/repo $testroot/wt > /dev/null
330 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
331 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
335 50952927 2019-01-12 stsp echo text > $testroot/repo/epsilon.txt
336 50952927 2019-01-12 stsp (cd $testroot/repo && git add epsilon.txt)
337 50952927 2019-01-12 stsp git_commit $testroot/repo -m "adding sibling of epsilon"
338 50952927 2019-01-12 stsp echo change > $testroot/repo/epsilon/zeta
339 50952927 2019-01-12 stsp git_commit $testroot/repo -m "changing epsilon/zeta"
341 f5d3d7af 2019-02-05 stsp echo "U epsilon/zeta" > $testroot/stdout.expected
342 f5d3d7af 2019-02-05 stsp echo "A epsilon.txt" >> $testroot/stdout.expected
343 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
344 50952927 2019-01-12 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
345 50952927 2019-01-12 stsp echo >> $testroot/stdout.expected
347 81a30460 2019-01-08 stsp (cd $testroot/wt && got update > $testroot/stdout)
349 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
351 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
352 81a30460 2019-01-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
353 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
357 50952927 2019-01-12 stsp echo "another change" > $testroot/repo/epsilon/zeta
358 50952927 2019-01-12 stsp git_commit $testroot/repo -m "changing epsilon/zeta again"
360 50952927 2019-01-12 stsp echo "U epsilon/zeta" > $testroot/stdout.expected
361 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
362 50952927 2019-01-12 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
363 50952927 2019-01-12 stsp echo >> $testroot/stdout.expected
365 50952927 2019-01-12 stsp (cd $testroot/wt && got update > $testroot/stdout)
367 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
369 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
370 81a30460 2019-01-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
371 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
375 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
377 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
378 50952927 2019-01-12 stsp diff -u $testroot/stdout.expected $testroot/stdout
380 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
383 f6cae3ed 2020-09-13 naddy test_update_moves_files_upwards() {
384 46cee7a3 2019-01-12 stsp local testroot=`test_init update_moves_files_upwards`
386 46cee7a3 2019-01-12 stsp mkdir $testroot/repo/epsilon/psi
387 46cee7a3 2019-01-12 stsp echo mu > $testroot/repo/epsilon/psi/mu
388 46cee7a3 2019-01-12 stsp mkdir $testroot/repo/epsilon/psi/chi
389 46cee7a3 2019-01-12 stsp echo tau > $testroot/repo/epsilon/psi/chi/tau
390 46cee7a3 2019-01-12 stsp (cd $testroot/repo && git add .)
391 46cee7a3 2019-01-12 stsp git_commit $testroot/repo -m "adding a sub-directory beneath epsilon"
393 46cee7a3 2019-01-12 stsp got checkout $testroot/repo $testroot/wt > /dev/null
395 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
396 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
400 46cee7a3 2019-01-12 stsp (cd $testroot/repo && git mv epsilon/psi/mu epsilon/mu)
401 46cee7a3 2019-01-12 stsp (cd $testroot/repo && git mv epsilon/psi/chi/tau epsilon/psi/tau)
402 46cee7a3 2019-01-12 stsp git_commit $testroot/repo -m "moving files upwards"
404 21908da4 2019-01-13 stsp echo "A epsilon/mu" > $testroot/stdout.expected
405 21908da4 2019-01-13 stsp echo "D epsilon/psi/chi/tau" >> $testroot/stdout.expected
406 46cee7a3 2019-01-12 stsp echo "D epsilon/psi/mu" >> $testroot/stdout.expected
407 bd4792ec 2019-01-13 stsp echo "A epsilon/psi/tau" >> $testroot/stdout.expected
408 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
409 46cee7a3 2019-01-12 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
410 46cee7a3 2019-01-12 stsp echo >> $testroot/stdout.expected
412 46cee7a3 2019-01-12 stsp (cd $testroot/wt && got update > $testroot/stdout)
414 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
416 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
417 46cee7a3 2019-01-12 stsp diff -u $testroot/stdout.expected $testroot/stdout
418 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
422 46cee7a3 2019-01-12 stsp if [ -e $testroot/wt/epsilon/psi/chi ]; then
423 46cee7a3 2019-01-12 stsp echo "removed dir epsilon/psi/chi still exists on disk" >&2
424 46cee7a3 2019-01-12 stsp test_done "$testroot" "1"
428 46cee7a3 2019-01-12 stsp if [ -e $testroot/wt/epsilon/psi/mu ]; then
429 46cee7a3 2019-01-12 stsp echo "removed file epsilon/psi/mu still exists on disk" >&2
430 46cee7a3 2019-01-12 stsp test_done "$testroot" "1"
434 46cee7a3 2019-01-12 stsp test_done "$testroot" "0"
437 f6cae3ed 2020-09-13 naddy test_update_moves_files_to_new_dir() {
438 46cee7a3 2019-01-12 stsp local testroot=`test_init update_moves_files_to_new_dir`
440 46cee7a3 2019-01-12 stsp mkdir $testroot/repo/epsilon/psi
441 46cee7a3 2019-01-12 stsp echo mu > $testroot/repo/epsilon/psi/mu
442 46cee7a3 2019-01-12 stsp mkdir $testroot/repo/epsilon/psi/chi
443 46cee7a3 2019-01-12 stsp echo tau > $testroot/repo/epsilon/psi/chi/tau
444 46cee7a3 2019-01-12 stsp (cd $testroot/repo && git add .)
445 46cee7a3 2019-01-12 stsp git_commit $testroot/repo -m "adding a sub-directory beneath epsilon"
447 46cee7a3 2019-01-12 stsp got checkout $testroot/repo $testroot/wt > /dev/null
449 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
450 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
454 46cee7a3 2019-01-12 stsp mkdir -p $testroot/repo/epsilon-new/psi
455 46cee7a3 2019-01-12 stsp (cd $testroot/repo && git mv epsilon/psi/mu epsilon-new/mu)
456 46cee7a3 2019-01-12 stsp (cd $testroot/repo && git mv epsilon/psi/chi/tau epsilon-new/psi/tau)
457 46cee7a3 2019-01-12 stsp git_commit $testroot/repo -m "moving files upwards"
459 f5d3d7af 2019-02-05 stsp echo "D epsilon/psi/chi/tau" > $testroot/stdout.expected
460 46cee7a3 2019-01-12 stsp echo "D epsilon/psi/mu" >> $testroot/stdout.expected
461 f5d3d7af 2019-02-05 stsp echo "A epsilon-new/mu" >> $testroot/stdout.expected
462 f5d3d7af 2019-02-05 stsp echo "A epsilon-new/psi/tau" >> $testroot/stdout.expected
463 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
464 46cee7a3 2019-01-12 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
465 46cee7a3 2019-01-12 stsp echo >> $testroot/stdout.expected
467 46cee7a3 2019-01-12 stsp (cd $testroot/wt && got update > $testroot/stdout)
469 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
471 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
472 46cee7a3 2019-01-12 stsp diff -u $testroot/stdout.expected $testroot/stdout
473 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
477 46cee7a3 2019-01-12 stsp if [ -e $testroot/wt/epsilon/psi/chi ]; then
478 46cee7a3 2019-01-12 stsp echo "removed dir epsilon/psi/chi still exists on disk" >&2
479 46cee7a3 2019-01-12 stsp test_done "$testroot" "1"
483 46cee7a3 2019-01-12 stsp if [ -e $testroot/wt/epsilon/psi/mu ]; then
484 46cee7a3 2019-01-12 stsp echo "removed file epsilon/psi/mu still exists on disk" >&2
485 46cee7a3 2019-01-12 stsp test_done "$testroot" "1"
489 4a1ddfc2 2019-01-12 stsp test_done "$testroot" "0"
492 f6cae3ed 2020-09-13 naddy test_update_creates_missing_parent() {
493 1aad446a 2019-01-13 stsp local testroot=`test_init update_creates_missing_parent 1`
495 4a1ddfc2 2019-01-12 stsp touch $testroot/repo/Makefile
496 4a1ddfc2 2019-01-12 stsp touch $testroot/repo/snake.6
497 4a1ddfc2 2019-01-12 stsp touch $testroot/repo/snake.c
498 4a1ddfc2 2019-01-12 stsp (cd $testroot/repo && git add .)
499 4a1ddfc2 2019-01-12 stsp git_commit $testroot/repo -m "adding initial snake tree"
501 4a1ddfc2 2019-01-12 stsp got checkout $testroot/repo $testroot/wt > /dev/null
503 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
504 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
508 4a1ddfc2 2019-01-12 stsp mkdir -p $testroot/repo/snake
509 4a1ddfc2 2019-01-12 stsp (cd $testroot/repo && git mv Makefile snake.6 snake.c snake)
510 4a1ddfc2 2019-01-12 stsp touch $testroot/repo/snake/move.c
511 4a1ddfc2 2019-01-12 stsp touch $testroot/repo/snake/pathnames.h
512 4a1ddfc2 2019-01-12 stsp touch $testroot/repo/snake/snake.h
513 4a1ddfc2 2019-01-12 stsp mkdir -p $testroot/repo/snscore
514 4a1ddfc2 2019-01-12 stsp touch $testroot/repo/snscore/Makefile
515 4a1ddfc2 2019-01-12 stsp touch $testroot/repo/snscore/snscore.c
516 4a1ddfc2 2019-01-12 stsp (cd $testroot/repo && git add .)
517 4a1ddfc2 2019-01-12 stsp git_commit $testroot/repo -m "restructuring snake tree"
519 4a1ddfc2 2019-01-12 stsp echo "D Makefile" > $testroot/stdout.expected
520 4a1ddfc2 2019-01-12 stsp echo "A snake/Makefile" >> $testroot/stdout.expected
521 4a1ddfc2 2019-01-12 stsp echo "A snake/move.c" >> $testroot/stdout.expected
522 4a1ddfc2 2019-01-12 stsp echo "A snake/pathnames.h" >> $testroot/stdout.expected
523 4a1ddfc2 2019-01-12 stsp echo "A snake/snake.6" >> $testroot/stdout.expected
524 4a1ddfc2 2019-01-12 stsp echo "A snake/snake.c" >> $testroot/stdout.expected
525 4a1ddfc2 2019-01-12 stsp echo "A snake/snake.h" >> $testroot/stdout.expected
526 18831e78 2019-02-10 stsp echo "D snake.6" >> $testroot/stdout.expected
527 18831e78 2019-02-10 stsp echo "D snake.c" >> $testroot/stdout.expected
528 bd4792ec 2019-01-13 stsp echo "A snscore/Makefile" >> $testroot/stdout.expected
529 bd4792ec 2019-01-13 stsp echo "A snscore/snscore.c" >> $testroot/stdout.expected
530 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
531 bd4792ec 2019-01-13 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
532 bd4792ec 2019-01-13 stsp echo >> $testroot/stdout.expected
534 bd4792ec 2019-01-13 stsp (cd $testroot/wt && got update > $testroot/stdout)
536 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
538 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
539 e60e7f5b 2019-02-10 stsp diff -u $testroot/stdout.expected $testroot/stdout
541 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
544 f6cae3ed 2020-09-13 naddy test_update_creates_missing_parent_with_subdir() {
545 1aad446a 2019-01-13 stsp local testroot=`test_init update_creates_missing_parent_with_subdir 1`
547 bd4792ec 2019-01-13 stsp touch $testroot/repo/Makefile
548 bd4792ec 2019-01-13 stsp touch $testroot/repo/snake.6
549 bd4792ec 2019-01-13 stsp touch $testroot/repo/snake.c
550 bd4792ec 2019-01-13 stsp (cd $testroot/repo && git add .)
551 bd4792ec 2019-01-13 stsp git_commit $testroot/repo -m "adding initial snake tree"
553 bd4792ec 2019-01-13 stsp got checkout $testroot/repo $testroot/wt > /dev/null
555 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
556 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
560 bd4792ec 2019-01-13 stsp mkdir -p $testroot/repo/sss/snake
561 bd4792ec 2019-01-13 stsp (cd $testroot/repo && git mv Makefile snake.6 snake.c sss/snake)
562 bd4792ec 2019-01-13 stsp touch $testroot/repo/sss/snake/move.c
563 bd4792ec 2019-01-13 stsp touch $testroot/repo/sss/snake/pathnames.h
564 bd4792ec 2019-01-13 stsp touch $testroot/repo/sss/snake/snake.h
565 bd4792ec 2019-01-13 stsp mkdir -p $testroot/repo/snscore
566 bd4792ec 2019-01-13 stsp touch $testroot/repo/snscore/Makefile
567 bd4792ec 2019-01-13 stsp touch $testroot/repo/snscore/snscore.c
568 bd4792ec 2019-01-13 stsp (cd $testroot/repo && git add .)
569 bd4792ec 2019-01-13 stsp git_commit $testroot/repo -m "restructuring snake tree"
571 bd4792ec 2019-01-13 stsp echo "D Makefile" > $testroot/stdout.expected
572 4a1ddfc2 2019-01-12 stsp echo "D snake.6" >> $testroot/stdout.expected
573 4a1ddfc2 2019-01-12 stsp echo "D snake.c" >> $testroot/stdout.expected
574 4a1ddfc2 2019-01-12 stsp echo "A snscore/Makefile" >> $testroot/stdout.expected
575 4a1ddfc2 2019-01-12 stsp echo "A snscore/snscore.c" >> $testroot/stdout.expected
576 bd4792ec 2019-01-13 stsp echo "A sss/snake/Makefile" >> $testroot/stdout.expected
577 bd4792ec 2019-01-13 stsp echo "A sss/snake/move.c" >> $testroot/stdout.expected
578 bd4792ec 2019-01-13 stsp echo "A sss/snake/pathnames.h" >> $testroot/stdout.expected
579 bd4792ec 2019-01-13 stsp echo "A sss/snake/snake.6" >> $testroot/stdout.expected
580 bd4792ec 2019-01-13 stsp echo "A sss/snake/snake.c" >> $testroot/stdout.expected
581 bd4792ec 2019-01-13 stsp echo "A sss/snake/snake.h" >> $testroot/stdout.expected
582 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
583 4a1ddfc2 2019-01-12 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
584 4a1ddfc2 2019-01-12 stsp echo >> $testroot/stdout.expected
586 4a1ddfc2 2019-01-12 stsp (cd $testroot/wt && got update > $testroot/stdout)
588 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
590 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
591 4a1ddfc2 2019-01-12 stsp diff -u $testroot/stdout.expected $testroot/stdout
592 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
596 46cee7a3 2019-01-12 stsp test_done "$testroot" "0"
599 f6cae3ed 2020-09-13 naddy test_update_file_in_subsubdir() {
600 1aad446a 2019-01-13 stsp local testroot=`test_init update_fle_in_subsubdir 1`
602 21908da4 2019-01-13 stsp touch $testroot/repo/Makefile
603 21908da4 2019-01-13 stsp mkdir -p $testroot/repo/altq
604 21908da4 2019-01-13 stsp touch $testroot/repo/altq/if_altq.h
605 21908da4 2019-01-13 stsp mkdir -p $testroot/repo/arch/alpha
606 21908da4 2019-01-13 stsp touch $testroot/repo/arch/alpha/Makefile
607 21908da4 2019-01-13 stsp (cd $testroot/repo && git add .)
608 21908da4 2019-01-13 stsp git_commit $testroot/repo -m "adding initial tree"
610 21908da4 2019-01-13 stsp got checkout $testroot/repo $testroot/wt > /dev/null
612 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
613 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
617 21908da4 2019-01-13 stsp echo change > $testroot/repo/arch/alpha/Makefile
618 21908da4 2019-01-13 stsp (cd $testroot/repo && git add .)
619 21908da4 2019-01-13 stsp git_commit $testroot/repo -m "changed a file"
621 21908da4 2019-01-13 stsp echo "U arch/alpha/Makefile" > $testroot/stdout.expected
622 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
623 21908da4 2019-01-13 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
624 21908da4 2019-01-13 stsp echo >> $testroot/stdout.expected
626 21908da4 2019-01-13 stsp (cd $testroot/wt && got update > $testroot/stdout)
628 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
630 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
631 21908da4 2019-01-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
632 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
636 21908da4 2019-01-13 stsp test_done "$testroot" "0"
639 f6cae3ed 2020-09-13 naddy test_update_merges_file_edits() {
640 6353ad76 2019-02-08 stsp local testroot=`test_init update_merges_file_edits`
642 6353ad76 2019-02-08 stsp echo "1" > $testroot/repo/numbers
643 6353ad76 2019-02-08 stsp echo "2" >> $testroot/repo/numbers
644 6353ad76 2019-02-08 stsp echo "3" >> $testroot/repo/numbers
645 6353ad76 2019-02-08 stsp echo "4" >> $testroot/repo/numbers
646 6353ad76 2019-02-08 stsp echo "5" >> $testroot/repo/numbers
647 6353ad76 2019-02-08 stsp echo "6" >> $testroot/repo/numbers
648 6353ad76 2019-02-08 stsp echo "7" >> $testroot/repo/numbers
649 6353ad76 2019-02-08 stsp echo "8" >> $testroot/repo/numbers
650 6353ad76 2019-02-08 stsp (cd $testroot/repo && git add numbers)
651 6353ad76 2019-02-08 stsp git_commit $testroot/repo -m "added numbers file"
652 f69721c3 2019-10-21 stsp local base_commit=`git_show_head $testroot/repo`
654 6353ad76 2019-02-08 stsp got checkout $testroot/repo $testroot/wt > /dev/null
656 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
657 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
661 6353ad76 2019-02-08 stsp echo "modified alpha" > $testroot/repo/alpha
662 6353ad76 2019-02-08 stsp echo "modified beta" > $testroot/repo/beta
663 c206b220 2021-10-09 thomas sed -i '' -e 's/2/22/' $testroot/repo/numbers
664 6353ad76 2019-02-08 stsp git_commit $testroot/repo -m "modified 3 files"
666 6353ad76 2019-02-08 stsp echo "modified alpha, too" > $testroot/wt/alpha
667 6353ad76 2019-02-08 stsp touch $testroot/wt/beta
668 c206b220 2021-10-09 thomas sed -i '' -e 's/7/77/' $testroot/wt/numbers
670 6353ad76 2019-02-08 stsp echo "C alpha" > $testroot/stdout.expected
671 6353ad76 2019-02-08 stsp echo "U beta" >> $testroot/stdout.expected
672 6353ad76 2019-02-08 stsp echo "G numbers" >> $testroot/stdout.expected
673 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
674 6353ad76 2019-02-08 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
675 6353ad76 2019-02-08 stsp echo >> $testroot/stdout.expected
676 9627c110 2020-04-18 stsp echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
678 6353ad76 2019-02-08 stsp (cd $testroot/wt && got update > $testroot/stdout)
680 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
682 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
683 6353ad76 2019-02-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
684 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
688 f69721c3 2019-10-21 stsp echo -n "<<<<<<< merged change: commit " > $testroot/content.expected
689 6353ad76 2019-02-08 stsp git_show_head $testroot/repo >> $testroot/content.expected
690 6353ad76 2019-02-08 stsp echo >> $testroot/content.expected
691 6353ad76 2019-02-08 stsp echo "modified alpha" >> $testroot/content.expected
692 f69721c3 2019-10-21 stsp echo "||||||| 3-way merge base: commit $base_commit" \
693 f69721c3 2019-10-21 stsp >> $testroot/content.expected
694 d136cfcb 2019-10-12 stsp echo "alpha" >> $testroot/content.expected
695 6353ad76 2019-02-08 stsp echo "=======" >> $testroot/content.expected
696 6353ad76 2019-02-08 stsp echo "modified alpha, too" >> $testroot/content.expected
697 f69721c3 2019-10-21 stsp echo '>>>>>>>' >> $testroot/content.expected
698 6353ad76 2019-02-08 stsp echo "modified beta" >> $testroot/content.expected
699 6353ad76 2019-02-08 stsp echo "1" >> $testroot/content.expected
700 6353ad76 2019-02-08 stsp echo "22" >> $testroot/content.expected
701 6353ad76 2019-02-08 stsp echo "3" >> $testroot/content.expected
702 6353ad76 2019-02-08 stsp echo "4" >> $testroot/content.expected
703 6353ad76 2019-02-08 stsp echo "5" >> $testroot/content.expected
704 6353ad76 2019-02-08 stsp echo "6" >> $testroot/content.expected
705 6353ad76 2019-02-08 stsp echo "77" >> $testroot/content.expected
706 6353ad76 2019-02-08 stsp echo "8" >> $testroot/content.expected
708 6353ad76 2019-02-08 stsp cat $testroot/wt/alpha > $testroot/content
709 6353ad76 2019-02-08 stsp cat $testroot/wt/beta >> $testroot/content
710 6353ad76 2019-02-08 stsp cat $testroot/wt/numbers >> $testroot/content
712 8d301dd9 2019-05-14 stsp cmp -s $testroot/content.expected $testroot/content
714 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
715 6353ad76 2019-02-08 stsp diff -u $testroot/content.expected $testroot/content
717 68ed9ba5 2019-02-10 stsp test_done "$testroot" "$ret"
720 f6cae3ed 2020-09-13 naddy test_update_keeps_xbit() {
721 68ed9ba5 2019-02-10 stsp local testroot=`test_init update_keeps_xbit 1`
723 68ed9ba5 2019-02-10 stsp touch $testroot/repo/xfile
724 68ed9ba5 2019-02-10 stsp chmod +x $testroot/repo/xfile
725 68ed9ba5 2019-02-10 stsp (cd $testroot/repo && git add .)
726 68ed9ba5 2019-02-10 stsp git_commit $testroot/repo -m "adding executable file"
728 68ed9ba5 2019-02-10 stsp got checkout $testroot/repo $testroot/wt > $testroot/stdout
730 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
731 68ed9ba5 2019-02-10 stsp test_done "$testroot" "$ret"
735 68ed9ba5 2019-02-10 stsp echo foo > $testroot/repo/xfile
736 68ed9ba5 2019-02-10 stsp git_commit $testroot/repo -m "changed executable file"
738 68ed9ba5 2019-02-10 stsp echo "U xfile" > $testroot/stdout.expected
739 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
740 68ed9ba5 2019-02-10 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
741 68ed9ba5 2019-02-10 stsp echo >> $testroot/stdout.expected
743 68ed9ba5 2019-02-10 stsp (cd $testroot/wt && got update > $testroot/stdout)
745 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
746 68ed9ba5 2019-02-10 stsp test_done "$testroot" "$ret"
750 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
752 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
753 68ed9ba5 2019-02-10 stsp diff -u $testroot/stdout.expected $testroot/stdout
754 68ed9ba5 2019-02-10 stsp test_done "$testroot" "$ret"
758 68ed9ba5 2019-02-10 stsp ls -l $testroot/wt/xfile | grep -q '^-rwx'
760 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
761 68ed9ba5 2019-02-10 stsp echo "file is not executable" >&2
762 68ed9ba5 2019-02-10 stsp ls -l $testroot/wt/xfile >&2
764 6353ad76 2019-02-08 stsp test_done "$testroot" "$ret"
767 f6cae3ed 2020-09-13 naddy test_update_clears_xbit() {
768 ba8a0d4d 2019-02-10 stsp local testroot=`test_init update_clears_xbit 1`
770 ba8a0d4d 2019-02-10 stsp touch $testroot/repo/xfile
771 ba8a0d4d 2019-02-10 stsp chmod +x $testroot/repo/xfile
772 ba8a0d4d 2019-02-10 stsp (cd $testroot/repo && git add .)
773 ba8a0d4d 2019-02-10 stsp git_commit $testroot/repo -m "adding executable file"
775 ba8a0d4d 2019-02-10 stsp got checkout $testroot/repo $testroot/wt > $testroot/stdout
777 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
778 ba8a0d4d 2019-02-10 stsp test_done "$testroot" "$ret"
782 ba8a0d4d 2019-02-10 stsp ls -l $testroot/wt/xfile | grep -q '^-rwx'
784 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
785 ba8a0d4d 2019-02-10 stsp echo "file is not executable" >&2
786 ba8a0d4d 2019-02-10 stsp ls -l $testroot/wt/xfile >&2
787 ba8a0d4d 2019-02-10 stsp test_done "$testroot" "$ret"
791 ba8a0d4d 2019-02-10 stsp # XXX git seems to require a file edit when flipping the x bit?
792 ba8a0d4d 2019-02-10 stsp echo foo > $testroot/repo/xfile
793 ba8a0d4d 2019-02-10 stsp chmod -x $testroot/repo/xfile
794 ba8a0d4d 2019-02-10 stsp git_commit $testroot/repo -m "not an executable file anymore"
796 ba8a0d4d 2019-02-10 stsp echo "U xfile" > $testroot/stdout.expected
797 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
798 ba8a0d4d 2019-02-10 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
799 ba8a0d4d 2019-02-10 stsp echo >> $testroot/stdout.expected
801 ba8a0d4d 2019-02-10 stsp (cd $testroot/wt && got update > $testroot/stdout)
803 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
804 ba8a0d4d 2019-02-10 stsp test_done "$testroot" "$ret"
808 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
810 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
811 ba8a0d4d 2019-02-10 stsp diff -u $testroot/stdout.expected $testroot/stdout
812 ba8a0d4d 2019-02-10 stsp test_done "$testroot" "$ret"
816 ba8a0d4d 2019-02-10 stsp ls -l $testroot/wt/xfile | grep -q '^-rw-'
818 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
819 ba8a0d4d 2019-02-10 stsp echo "file is unexpectedly executable" >&2
820 ba8a0d4d 2019-02-10 stsp ls -l $testroot/wt/xfile >&2
822 ba8a0d4d 2019-02-10 stsp test_done "$testroot" "$ret"
825 f6cae3ed 2020-09-13 naddy test_update_restores_missing_file() {
826 a378724f 2019-02-10 stsp local testroot=`test_init update_restores_missing_file`
828 a378724f 2019-02-10 stsp got checkout $testroot/repo $testroot/wt > /dev/null
830 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
831 a378724f 2019-02-10 stsp test_done "$testroot" "$ret"
835 a378724f 2019-02-10 stsp rm $testroot/wt/alpha
837 a378724f 2019-02-10 stsp echo "! alpha" > $testroot/stdout.expected
838 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
839 1545c615 2019-02-10 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
840 1545c615 2019-02-10 stsp echo >> $testroot/stdout.expected
841 a378724f 2019-02-10 stsp (cd $testroot/wt && got update > $testroot/stdout)
843 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
845 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
846 a378724f 2019-02-10 stsp diff -u $testroot/stdout.expected $testroot/stdout
847 a378724f 2019-02-10 stsp test_done "$testroot" "$ret"
851 a378724f 2019-02-10 stsp echo "alpha" > $testroot/content.expected
853 a378724f 2019-02-10 stsp cat $testroot/wt/alpha > $testroot/content
855 8d301dd9 2019-05-14 stsp cmp -s $testroot/content.expected $testroot/content
857 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
858 1430b4e0 2019-03-27 stsp diff -u $testroot/content.expected $testroot/content
860 1430b4e0 2019-03-27 stsp test_done "$testroot" "$ret"
863 f6cae3ed 2020-09-13 naddy test_update_conflict_wt_add_vs_repo_add() {
864 085d5bcf 2019-03-27 stsp local testroot=`test_init update_conflict_wt_add_vs_repo_add`
866 1430b4e0 2019-03-27 stsp got checkout $testroot/repo $testroot/wt > /dev/null
868 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
869 1430b4e0 2019-03-27 stsp test_done "$testroot" "$ret"
873 1430b4e0 2019-03-27 stsp echo "new" > $testroot/repo/gamma/new
874 1430b4e0 2019-03-27 stsp (cd $testroot/repo && git add .)
875 1430b4e0 2019-03-27 stsp git_commit $testroot/repo -m "adding a new file"
877 1430b4e0 2019-03-27 stsp echo "also new" > $testroot/wt/gamma/new
878 1430b4e0 2019-03-27 stsp (cd $testroot/wt && got add gamma/new >/dev/null)
880 1430b4e0 2019-03-27 stsp (cd $testroot/wt && got update > $testroot/stdout)
882 1430b4e0 2019-03-27 stsp echo "C gamma/new" > $testroot/stdout.expected
883 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
884 1430b4e0 2019-03-27 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
885 1430b4e0 2019-03-27 stsp echo >> $testroot/stdout.expected
886 9627c110 2020-04-18 stsp echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
888 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
890 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
891 1430b4e0 2019-03-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
892 1430b4e0 2019-03-27 stsp test_done "$testroot" "$ret"
896 f69721c3 2019-10-21 stsp echo -n "<<<<<<< merged change: commit " > $testroot/content.expected
897 1430b4e0 2019-03-27 stsp git_show_head $testroot/repo >> $testroot/content.expected
898 1430b4e0 2019-03-27 stsp echo >> $testroot/content.expected
899 1430b4e0 2019-03-27 stsp echo "new" >> $testroot/content.expected
900 1430b4e0 2019-03-27 stsp echo "=======" >> $testroot/content.expected
901 1430b4e0 2019-03-27 stsp echo "also new" >> $testroot/content.expected
902 f69721c3 2019-10-21 stsp echo '>>>>>>>' >> $testroot/content.expected
904 1430b4e0 2019-03-27 stsp cat $testroot/wt/gamma/new > $testroot/content
906 8d301dd9 2019-05-14 stsp cmp -s $testroot/content.expected $testroot/content
908 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
909 a378724f 2019-02-10 stsp diff -u $testroot/content.expected $testroot/content
910 3165301c 2019-03-27 stsp test_done "$testroot" "$ret"
914 3165301c 2019-03-27 stsp # resolve the conflict
915 3165301c 2019-03-27 stsp echo "new and also new" > $testroot/wt/gamma/new
916 3165301c 2019-03-27 stsp echo 'M gamma/new' > $testroot/stdout.expected
917 3165301c 2019-03-27 stsp (cd $testroot/wt && got status > $testroot/stdout)
918 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
920 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
921 3165301c 2019-03-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
923 a378724f 2019-02-10 stsp test_done "$testroot" "$ret"
926 f6cae3ed 2020-09-13 naddy test_update_conflict_wt_edit_vs_repo_rm() {
927 085d5bcf 2019-03-27 stsp local testroot=`test_init update_conflict_wt_edit_vs_repo_rm`
929 708d8e67 2019-03-27 stsp got checkout $testroot/repo $testroot/wt > /dev/null
931 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
932 708d8e67 2019-03-27 stsp test_done "$testroot" "$ret"
936 708d8e67 2019-03-27 stsp (cd $testroot/repo && git rm -q beta)
937 708d8e67 2019-03-27 stsp git_commit $testroot/repo -m "removing a file"
939 708d8e67 2019-03-27 stsp echo "modified beta" > $testroot/wt/beta
941 708d8e67 2019-03-27 stsp (cd $testroot/wt && got update > $testroot/stdout)
943 fc6346c4 2019-03-27 stsp echo "G beta" > $testroot/stdout.expected
944 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
945 708d8e67 2019-03-27 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
946 708d8e67 2019-03-27 stsp echo >> $testroot/stdout.expected
947 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
949 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
950 708d8e67 2019-03-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
951 708d8e67 2019-03-27 stsp test_done "$testroot" "$ret"
955 708d8e67 2019-03-27 stsp echo "modified beta" > $testroot/content.expected
957 708d8e67 2019-03-27 stsp cat $testroot/wt/beta > $testroot/content
959 8d301dd9 2019-05-14 stsp cmp -s $testroot/content.expected $testroot/content
961 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
962 708d8e67 2019-03-27 stsp diff -u $testroot/content.expected $testroot/content
963 708d8e67 2019-03-27 stsp test_done "$testroot" "$ret"
967 fc6346c4 2019-03-27 stsp # beta is now an added file... we don't flag tree conflicts yet
968 fc6346c4 2019-03-27 stsp echo 'A beta' > $testroot/stdout.expected
969 13d9040b 2019-03-27 stsp (cd $testroot/wt && got status > $testroot/stdout)
970 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
972 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
973 13d9040b 2019-03-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
975 13d9040b 2019-03-27 stsp test_done "$testroot" "$ret"
978 f6cae3ed 2020-09-13 naddy test_update_conflict_wt_rm_vs_repo_edit() {
979 13d9040b 2019-03-27 stsp local testroot=`test_init update_conflict_wt_rm_vs_repo_edit`
981 13d9040b 2019-03-27 stsp got checkout $testroot/repo $testroot/wt > /dev/null
983 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
984 13d9040b 2019-03-27 stsp test_done "$testroot" "$ret"
988 13d9040b 2019-03-27 stsp echo "modified beta" > $testroot/repo/beta
989 13d9040b 2019-03-27 stsp git_commit $testroot/repo -m "modified a file"
991 13d9040b 2019-03-27 stsp (cd $testroot/wt && got rm beta > /dev/null)
993 13d9040b 2019-03-27 stsp (cd $testroot/wt && got update > $testroot/stdout)
995 13d9040b 2019-03-27 stsp echo "G beta" > $testroot/stdout.expected
996 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
997 13d9040b 2019-03-27 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
998 13d9040b 2019-03-27 stsp echo >> $testroot/stdout.expected
999 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1001 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1002 13d9040b 2019-03-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
1003 13d9040b 2019-03-27 stsp test_done "$testroot" "$ret"
1007 13d9040b 2019-03-27 stsp # beta remains a deleted file... we don't flag tree conflicts yet
1008 13d9040b 2019-03-27 stsp echo 'D beta' > $testroot/stdout.expected
1009 708d8e67 2019-03-27 stsp (cd $testroot/wt && got status > $testroot/stdout)
1010 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1012 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1013 708d8e67 2019-03-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
1014 13d9040b 2019-03-27 stsp test_done "$testroot" "$ret"
1018 13d9040b 2019-03-27 stsp # 'got diff' should show post-update contents of beta being deleted
1019 13d9040b 2019-03-27 stsp local head_rev=`git_show_head $testroot/repo`
1020 13d9040b 2019-03-27 stsp echo "diff $head_rev $testroot/wt" > $testroot/stdout.expected
1021 13d9040b 2019-03-27 stsp echo -n 'blob - ' >> $testroot/stdout.expected
1022 13d9040b 2019-03-27 stsp got tree -r $testroot/repo -i | grep 'beta$' | cut -d' ' -f 1 \
1023 13d9040b 2019-03-27 stsp >> $testroot/stdout.expected
1024 13d9040b 2019-03-27 stsp echo 'file + /dev/null' >> $testroot/stdout.expected
1025 13d9040b 2019-03-27 stsp echo '--- beta' >> $testroot/stdout.expected
1026 1cb46f00 2020-11-21 stsp echo '+++ /dev/null' >> $testroot/stdout.expected
1027 13d9040b 2019-03-27 stsp echo '@@ -1 +0,0 @@' >> $testroot/stdout.expected
1028 13d9040b 2019-03-27 stsp echo '-modified beta' >> $testroot/stdout.expected
1030 13d9040b 2019-03-27 stsp (cd $testroot/wt && got diff > $testroot/stdout)
1031 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1033 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1034 13d9040b 2019-03-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
1036 708d8e67 2019-03-27 stsp test_done "$testroot" "$ret"
1039 f6cae3ed 2020-09-13 naddy test_update_conflict_wt_rm_vs_repo_rm() {
1040 66b11bf5 2019-03-27 stsp local testroot=`test_init update_conflict_wt_rm_vs_repo_rm`
1042 66b11bf5 2019-03-27 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1044 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1045 66b11bf5 2019-03-27 stsp test_done "$testroot" "$ret"
1049 66b11bf5 2019-03-27 stsp (cd $testroot/repo && git rm -q beta)
1050 66b11bf5 2019-03-27 stsp git_commit $testroot/repo -m "removing a file"
1052 66b11bf5 2019-03-27 stsp (cd $testroot/wt && got rm beta > /dev/null)
1054 66b11bf5 2019-03-27 stsp (cd $testroot/wt && got update > $testroot/stdout)
1056 66b11bf5 2019-03-27 stsp echo "D beta" > $testroot/stdout.expected
1057 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
1058 66b11bf5 2019-03-27 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1059 66b11bf5 2019-03-27 stsp echo >> $testroot/stdout.expected
1060 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1062 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1063 66b11bf5 2019-03-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
1064 66b11bf5 2019-03-27 stsp test_done "$testroot" "$ret"
1068 66b11bf5 2019-03-27 stsp # beta is now gone... we don't flag tree conflicts yet
1069 2a06fe5f 2019-08-24 stsp echo "N beta" > $testroot/stdout.expected
1070 54817d72 2019-07-27 stsp echo -n > $testroot/stderr.expected
1071 54817d72 2019-07-27 stsp (cd $testroot/wt && got status beta > $testroot/stdout \
1072 54817d72 2019-07-27 stsp 2> $testroot/stderr)
1073 54817d72 2019-07-27 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1075 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1076 54817d72 2019-07-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
1077 54817d72 2019-07-27 stsp test_done "$testroot" "$ret"
1080 8d301dd9 2019-05-14 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1082 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1083 66b11bf5 2019-03-27 stsp diff -u $testroot/stderr.expected $testroot/stderr
1084 66b11bf5 2019-03-27 stsp test_done "$testroot" "$ret"
1088 66b11bf5 2019-03-27 stsp if [ -e $testroot/wt/beta ]; then
1089 66b11bf5 2019-03-27 stsp echo "removed file beta still exists on disk" >&2
1090 66b11bf5 2019-03-27 stsp test_done "$testroot" "1"
1094 66b11bf5 2019-03-27 stsp test_done "$testroot" "0"
1097 f6cae3ed 2020-09-13 naddy test_update_partial() {
1098 c4cdcb68 2019-04-03 stsp local testroot=`test_init update_partial`
1100 c4cdcb68 2019-04-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1102 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1103 c4cdcb68 2019-04-03 stsp test_done "$testroot" "$ret"
1107 c4cdcb68 2019-04-03 stsp echo "modified alpha" > $testroot/repo/alpha
1108 c4cdcb68 2019-04-03 stsp echo "modified beta" > $testroot/repo/beta
1109 c4cdcb68 2019-04-03 stsp echo "modified epsilon/zeta" > $testroot/repo/epsilon/zeta
1110 c4cdcb68 2019-04-03 stsp git_commit $testroot/repo -m "modified two files"
1112 f2ea84fa 2019-07-27 stsp echo "U alpha" > $testroot/stdout.expected
1113 f2ea84fa 2019-07-27 stsp echo "U beta" >> $testroot/stdout.expected
1114 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
1115 f2ea84fa 2019-07-27 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1116 f2ea84fa 2019-07-27 stsp echo >> $testroot/stdout.expected
1118 f2ea84fa 2019-07-27 stsp (cd $testroot/wt && got update alpha beta > $testroot/stdout)
1120 f2ea84fa 2019-07-27 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1122 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1123 f2ea84fa 2019-07-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
1124 f2ea84fa 2019-07-27 stsp test_done "$testroot" "$ret"
1128 f2ea84fa 2019-07-27 stsp echo "modified alpha" > $testroot/content.expected
1129 f2ea84fa 2019-07-27 stsp echo "modified beta" >> $testroot/content.expected
1131 f2ea84fa 2019-07-27 stsp cat $testroot/wt/alpha $testroot/wt/beta > $testroot/content
1132 f2ea84fa 2019-07-27 stsp cmp -s $testroot/content.expected $testroot/content
1134 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1135 f2ea84fa 2019-07-27 stsp diff -u $testroot/content.expected $testroot/content
1136 f2ea84fa 2019-07-27 stsp test_done "$testroot" "$ret"
1140 e4d984c2 2019-05-22 stsp echo "U epsilon/zeta" > $testroot/stdout.expected
1141 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
1142 e4d984c2 2019-05-22 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1143 e4d984c2 2019-05-22 stsp echo >> $testroot/stdout.expected
1145 e4d984c2 2019-05-22 stsp (cd $testroot/wt && got update epsilon > $testroot/stdout)
1147 e4d984c2 2019-05-22 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1149 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1150 e4d984c2 2019-05-22 stsp diff -u $testroot/stdout.expected $testroot/stdout
1151 e4d984c2 2019-05-22 stsp test_done "$testroot" "$ret"
1155 e4d984c2 2019-05-22 stsp echo "modified epsilon/zeta" > $testroot/content.expected
1156 e4d984c2 2019-05-22 stsp cat $testroot/wt/epsilon/zeta > $testroot/content
1158 e4d984c2 2019-05-22 stsp cmp -s $testroot/content.expected $testroot/content
1160 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1161 e4d984c2 2019-05-22 stsp diff -u $testroot/content.expected $testroot/content
1162 e4d984c2 2019-05-22 stsp test_done "$testroot" "$ret"
1166 c4cdcb68 2019-04-03 stsp test_done "$testroot" "$ret"
1169 f6cae3ed 2020-09-13 naddy test_update_partial_add() {
1170 c4cdcb68 2019-04-03 stsp local testroot=`test_init update_partial_add`
1172 c4cdcb68 2019-04-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1174 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1175 c4cdcb68 2019-04-03 stsp test_done "$testroot" "$ret"
1179 c4cdcb68 2019-04-03 stsp echo "new" > $testroot/repo/new
1180 c4cdcb68 2019-04-03 stsp echo "epsilon/new2" > $testroot/repo/epsilon/new2
1181 c4cdcb68 2019-04-03 stsp (cd $testroot/repo && git add .)
1182 c4cdcb68 2019-04-03 stsp git_commit $testroot/repo -m "added two files"
1184 f1417e9f 2021-10-12 thomas echo "A epsilon/new2" > $testroot/stdout.expected
1185 f1417e9f 2021-10-12 thomas echo "A new" >> $testroot/stdout.expected
1186 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
1187 f2ea84fa 2019-07-27 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1188 f2ea84fa 2019-07-27 stsp echo >> $testroot/stdout.expected
1190 f2ea84fa 2019-07-27 stsp (cd $testroot/wt && got update new epsilon/new2 > $testroot/stdout)
1192 f2ea84fa 2019-07-27 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1194 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1195 f2ea84fa 2019-07-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
1196 f2ea84fa 2019-07-27 stsp test_done "$testroot" "$ret"
1200 f2ea84fa 2019-07-27 stsp echo "new" > $testroot/content.expected
1201 f2ea84fa 2019-07-27 stsp echo "epsilon/new2" >> $testroot/content.expected
1203 f2ea84fa 2019-07-27 stsp cat $testroot/wt/new $testroot/wt/epsilon/new2 > $testroot/content
1205 f2ea84fa 2019-07-27 stsp cmp -s $testroot/content.expected $testroot/content
1207 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1208 f2ea84fa 2019-07-27 stsp diff -u $testroot/content.expected $testroot/content
1210 c4cdcb68 2019-04-03 stsp test_done "$testroot" "$ret"
1213 f6cae3ed 2020-09-13 naddy test_update_partial_rm() {
1214 c4cdcb68 2019-04-03 stsp local testroot=`test_init update_partial_rm`
1216 c4cdcb68 2019-04-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1218 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1219 c4cdcb68 2019-04-03 stsp test_done "$testroot" "$ret"
1223 f2ea84fa 2019-07-27 stsp (cd $testroot/repo && git rm -q alpha epsilon/zeta)
1224 c4cdcb68 2019-04-03 stsp git_commit $testroot/repo -m "removed two files"
1226 b66cd6f3 2020-07-31 stsp echo "got: /alpha: no such entry found in tree" \
1227 f2ea84fa 2019-07-27 stsp > $testroot/stderr.expected
1229 f2ea84fa 2019-07-27 stsp (cd $testroot/wt && got update alpha epsilon/zeta 2> $testroot/stderr)
1231 fc414659 2022-04-16 thomas if [ $ret -eq 0 ]; then
1232 f2ea84fa 2019-07-27 stsp echo "update succeeded unexpectedly" >&2
1233 f2ea84fa 2019-07-27 stsp test_done "$testroot" "1"
1237 f2ea84fa 2019-07-27 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1239 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1240 f2ea84fa 2019-07-27 stsp diff -u $testroot/stderr.expected $testroot/stderr
1241 f2ea84fa 2019-07-27 stsp test_done "$testroot" "$ret"
1244 c4cdcb68 2019-04-03 stsp test_done "$testroot" "$ret"
1247 f6cae3ed 2020-09-13 naddy test_update_partial_dir() {
1248 c4cdcb68 2019-04-03 stsp local testroot=`test_init update_partial_dir`
1250 c4cdcb68 2019-04-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1252 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1253 c4cdcb68 2019-04-03 stsp test_done "$testroot" "$ret"
1257 c4cdcb68 2019-04-03 stsp echo "modified alpha" > $testroot/repo/alpha
1258 c4cdcb68 2019-04-03 stsp echo "modified beta" > $testroot/repo/beta
1259 c4cdcb68 2019-04-03 stsp echo "modified epsilon/zeta" > $testroot/repo/epsilon/zeta
1260 c4cdcb68 2019-04-03 stsp git_commit $testroot/repo -m "modified two files"
1262 c4cdcb68 2019-04-03 stsp echo "U epsilon/zeta" > $testroot/stdout.expected
1263 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
1264 c4cdcb68 2019-04-03 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1265 c4cdcb68 2019-04-03 stsp echo >> $testroot/stdout.expected
1267 c4cdcb68 2019-04-03 stsp (cd $testroot/wt && got update epsilon > $testroot/stdout)
1269 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1271 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1272 c4cdcb68 2019-04-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
1273 c4cdcb68 2019-04-03 stsp test_done "$testroot" "$ret"
1277 c4cdcb68 2019-04-03 stsp echo "modified epsilon/zeta" > $testroot/content.expected
1278 c4cdcb68 2019-04-03 stsp cat $testroot/wt/epsilon/zeta > $testroot/content
1280 8d301dd9 2019-05-14 stsp cmp -s $testroot/content.expected $testroot/content
1282 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1283 c4cdcb68 2019-04-03 stsp diff -u $testroot/content.expected $testroot/content
1284 c4cdcb68 2019-04-03 stsp test_done "$testroot" "$ret"
1287 c4cdcb68 2019-04-03 stsp test_done "$testroot" "$ret"
1291 f6cae3ed 2020-09-13 naddy test_update_moved_branch_ref() {
1292 d5bea539 2019-05-13 stsp local testroot=`test_init update_moved_branch_ref`
1294 d5bea539 2019-05-13 stsp git clone -q --mirror $testroot/repo $testroot/repo2
1296 d5bea539 2019-05-13 stsp echo "modified alpha with git" > $testroot/repo/alpha
1297 d5bea539 2019-05-13 stsp git_commit $testroot/repo -m "modified alpha with git"
1299 d5bea539 2019-05-13 stsp got checkout $testroot/repo2 $testroot/wt > /dev/null
1301 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1302 d5bea539 2019-05-13 stsp test_done "$testroot" "$ret"
1306 d5bea539 2019-05-13 stsp echo "modified alpha with got" > $testroot/wt/alpha
1307 d5bea539 2019-05-13 stsp (cd $testroot/wt && got commit -m "modified alpha with got" > /dev/null)
1309 d5bea539 2019-05-13 stsp # + xxxxxxx...yyyyyyy master -> master (forced update)
1310 d5bea539 2019-05-13 stsp (cd $testroot/repo2 && git fetch -q --all)
1312 d5bea539 2019-05-13 stsp echo -n > $testroot/stdout.expected
1313 a1fb16d8 2019-05-24 stsp echo -n "got: work tree's head reference now points to a different " \
1314 a367ff0f 2019-05-14 stsp > $testroot/stderr.expected
1315 a1fb16d8 2019-05-24 stsp echo "branch; new head reference and/or update -b required" \
1316 a1fb16d8 2019-05-24 stsp >> $testroot/stderr.expected
1318 d5bea539 2019-05-13 stsp (cd $testroot/wt && got update > $testroot/stdout 2> $testroot/stderr)
1320 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1322 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1323 d5bea539 2019-05-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
1324 d5bea539 2019-05-13 stsp test_done "$testroot" "$ret"
1328 8d301dd9 2019-05-14 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1330 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1331 d5bea539 2019-05-13 stsp diff -u $testroot/stderr.expected $testroot/stderr
1333 d5bea539 2019-05-13 stsp test_done "$testroot" "$ret"
1336 f6cae3ed 2020-09-13 naddy test_update_to_another_branch() {
1337 024e9686 2019-05-14 stsp local testroot=`test_init update_to_another_branch`
1338 f69721c3 2019-10-21 stsp local base_commit=`git_show_head $testroot/repo`
1340 024e9686 2019-05-14 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1342 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1343 024e9686 2019-05-14 stsp test_done "$testroot" "$ret"
1347 024e9686 2019-05-14 stsp echo 'refs/heads/master'> $testroot/head-ref.expected
1348 024e9686 2019-05-14 stsp cmp -s $testroot/head-ref.expected $testroot/wt/.got/head-ref
1350 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1351 024e9686 2019-05-14 stsp diff -u $testroot/head-ref.expected $testroot/wt/.got/head-ref
1352 024e9686 2019-05-14 stsp test_done "$testroot" "$ret"
1356 024e9686 2019-05-14 stsp (cd $testroot/repo && git checkout -q -b newbranch)
1357 024e9686 2019-05-14 stsp echo "modified alpha on new branch" > $testroot/repo/alpha
1358 024e9686 2019-05-14 stsp git_commit $testroot/repo -m "modified alpha on new branch"
1360 024e9686 2019-05-14 stsp echo "modified alpha in work tree" > $testroot/wt/alpha
1362 d969fa15 2019-05-22 stsp echo "Switching work tree from refs/heads/master to refs/heads/newbranch" > $testroot/stdout.expected
1363 d969fa15 2019-05-22 stsp echo "C alpha" >> $testroot/stdout.expected
1364 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/newbranch: " >> $testroot/stdout.expected
1365 024e9686 2019-05-14 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1366 024e9686 2019-05-14 stsp echo >> $testroot/stdout.expected
1367 9627c110 2020-04-18 stsp echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
1369 024e9686 2019-05-14 stsp (cd $testroot/wt && got update -b newbranch > $testroot/stdout)
1371 024e9686 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1373 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1374 024e9686 2019-05-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
1375 024e9686 2019-05-14 stsp test_done "$testroot" "$ret"
1379 f69721c3 2019-10-21 stsp echo -n "<<<<<<< merged change: commit " > $testroot/content.expected
1380 024e9686 2019-05-14 stsp git_show_head $testroot/repo >> $testroot/content.expected
1381 024e9686 2019-05-14 stsp echo >> $testroot/content.expected
1382 024e9686 2019-05-14 stsp echo "modified alpha on new branch" >> $testroot/content.expected
1383 f69721c3 2019-10-21 stsp echo "||||||| 3-way merge base: commit $base_commit" \
1384 f69721c3 2019-10-21 stsp >> $testroot/content.expected
1385 d136cfcb 2019-10-12 stsp echo "alpha" >> $testroot/content.expected
1386 024e9686 2019-05-14 stsp echo "=======" >> $testroot/content.expected
1387 024e9686 2019-05-14 stsp echo "modified alpha in work tree" >> $testroot/content.expected
1388 f69721c3 2019-10-21 stsp echo '>>>>>>>' >> $testroot/content.expected
1390 024e9686 2019-05-14 stsp cat $testroot/wt/alpha > $testroot/content
1392 024e9686 2019-05-14 stsp cmp -s $testroot/content.expected $testroot/content
1394 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1395 024e9686 2019-05-14 stsp diff -u $testroot/content.expected $testroot/content
1396 024e9686 2019-05-14 stsp test_done "$testroot" "$ret"
1400 024e9686 2019-05-14 stsp echo 'refs/heads/newbranch'> $testroot/head-ref.expected
1401 024e9686 2019-05-14 stsp cmp -s $testroot/head-ref.expected $testroot/wt/.got/head-ref
1403 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1404 024e9686 2019-05-14 stsp diff -u $testroot/head-ref.expected $testroot/wt/.got/head-ref
1405 a367ff0f 2019-05-14 stsp test_done "$testroot" "$ret"
1409 a367ff0f 2019-05-14 stsp test_done "$testroot" "$ret"
1412 f6cae3ed 2020-09-13 naddy test_update_to_commit_on_wrong_branch() {
1413 a367ff0f 2019-05-14 stsp local testroot=`test_init update_to_commit_on_wrong_branch`
1415 a367ff0f 2019-05-14 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1417 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1418 a367ff0f 2019-05-14 stsp test_done "$testroot" "$ret"
1422 a367ff0f 2019-05-14 stsp (cd $testroot/repo && git checkout -q -b newbranch)
1423 a367ff0f 2019-05-14 stsp echo "modified alpha on new branch" > $testroot/repo/alpha
1424 a367ff0f 2019-05-14 stsp git_commit $testroot/repo -m "modified alpha on new branch"
1426 a367ff0f 2019-05-14 stsp echo -n "" > $testroot/stdout.expected
1427 a367ff0f 2019-05-14 stsp echo "got: target commit is on a different branch" \
1428 a367ff0f 2019-05-14 stsp > $testroot/stderr.expected
1430 a367ff0f 2019-05-14 stsp local head_rev=`git_show_head $testroot/repo`
1431 a367ff0f 2019-05-14 stsp (cd $testroot/wt && got update -c $head_rev > $testroot/stdout \
1432 a367ff0f 2019-05-14 stsp 2> $testroot/stderr)
1434 a367ff0f 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1436 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1437 a367ff0f 2019-05-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
1438 024e9686 2019-05-14 stsp test_done "$testroot" "$ret"
1442 a367ff0f 2019-05-14 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1444 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1445 a367ff0f 2019-05-14 stsp diff -u $testroot/stderr.expected $testroot/stderr
1446 a367ff0f 2019-05-14 stsp test_done "$testroot" "$ret"
1450 024e9686 2019-05-14 stsp test_done "$testroot" "$ret"
1453 f6cae3ed 2020-09-13 naddy test_update_bumps_base_commit_id() {
1454 a5e55564 2019-06-10 stsp local testroot=`test_init update_bumps_base_commit_id`
1456 1a36436d 2019-06-10 stsp echo "psi" > $testroot/repo/epsilon/psi
1457 1a36436d 2019-06-10 stsp (cd $testroot/repo && git add .)
1458 1a36436d 2019-06-10 stsp git_commit $testroot/repo -m "adding another file"
1460 c932eeeb 2019-05-22 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1462 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1463 c932eeeb 2019-05-22 stsp test_done "$testroot" "$ret"
1467 1a36436d 2019-06-10 stsp echo "modified psi" > $testroot/wt/epsilon/psi
1468 1a36436d 2019-06-10 stsp (cd $testroot/wt && got commit -m "changed psi" > $testroot/stdout)
1470 c932eeeb 2019-05-22 stsp local head_rev=`git_show_head $testroot/repo`
1471 1a36436d 2019-06-10 stsp echo "M epsilon/psi" > $testroot/stdout.expected
1472 a7648d7a 2019-06-02 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
1473 c932eeeb 2019-05-22 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1475 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1476 c932eeeb 2019-05-22 stsp diff -u $testroot/stdout.expected $testroot/stdout
1477 c932eeeb 2019-05-22 stsp test_done "$testroot" "$ret"
1481 305993b9 2019-07-28 stsp echo "changed zeta with git" > $testroot/repo/epsilon/zeta
1482 9bead371 2019-07-28 stsp (cd $testroot/repo && git add .)
1483 9bead371 2019-07-28 stsp git_commit $testroot/repo -m "changing zeta with git"
1485 1a36436d 2019-06-10 stsp echo "modified zeta" > $testroot/wt/epsilon/zeta
1486 1a36436d 2019-06-10 stsp (cd $testroot/wt && got commit -m "changed zeta" > $testroot/stdout \
1487 c932eeeb 2019-05-22 stsp 2> $testroot/stderr)
1489 c932eeeb 2019-05-22 stsp echo -n "" > $testroot/stdout.expected
1490 c932eeeb 2019-05-22 stsp echo "got: work tree must be updated before these changes can be committed" > $testroot/stderr.expected
1491 c932eeeb 2019-05-22 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1493 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1494 c932eeeb 2019-05-22 stsp diff -u $testroot/stderr.expected $testroot/stderr
1495 c932eeeb 2019-05-22 stsp test_done "$testroot" "$ret"
1499 c932eeeb 2019-05-22 stsp (cd $testroot/wt && got update > $testroot/stdout)
1501 9bead371 2019-07-28 stsp echo "U epsilon/psi" > $testroot/stdout.expected
1502 9bead371 2019-07-28 stsp echo "C epsilon/zeta" >> $testroot/stdout.expected
1503 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
1504 a484d721 2019-06-10 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1505 a484d721 2019-06-10 stsp echo >> $testroot/stdout.expected
1506 9627c110 2020-04-18 stsp echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
1508 c932eeeb 2019-05-22 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1510 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1511 c932eeeb 2019-05-22 stsp diff -u $testroot/stdout.expected $testroot/stdout
1512 c932eeeb 2019-05-22 stsp test_done "$testroot" "$ret"
1516 9bead371 2019-07-28 stsp # resolve conflict
1517 9bead371 2019-07-28 stsp echo "modified zeta with got and git" > $testroot/wt/epsilon/zeta
1519 1a36436d 2019-06-10 stsp (cd $testroot/wt && got commit -m "changed zeta" > $testroot/stdout)
1521 c932eeeb 2019-05-22 stsp local head_rev=`git_show_head $testroot/repo`
1522 1a36436d 2019-06-10 stsp echo "M epsilon/zeta" > $testroot/stdout.expected
1523 a7648d7a 2019-06-02 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
1524 303e2782 2019-08-09 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1526 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1527 303e2782 2019-08-09 stsp diff -u $testroot/stdout.expected $testroot/stdout
1528 303e2782 2019-08-09 stsp test_done "$testroot" "$ret"
1532 303e2782 2019-08-09 stsp test_done "$testroot" "$ret"
1535 f6cae3ed 2020-09-13 naddy test_update_tag() {
1536 303e2782 2019-08-09 stsp local testroot=`test_init update_tag`
1537 303e2782 2019-08-09 stsp local tag="1.0.0"
1539 303e2782 2019-08-09 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1541 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1542 303e2782 2019-08-09 stsp test_done "$testroot" "$ret"
1546 303e2782 2019-08-09 stsp echo "modified alpha" > $testroot/repo/alpha
1547 303e2782 2019-08-09 stsp git_commit $testroot/repo -m "modified alpha"
1548 303e2782 2019-08-09 stsp (cd $testroot/repo && git tag -m "test" -a $tag)
1550 303e2782 2019-08-09 stsp echo "U alpha" > $testroot/stdout.expected
1551 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
1552 303e2782 2019-08-09 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1553 303e2782 2019-08-09 stsp echo >> $testroot/stdout.expected
1555 303e2782 2019-08-09 stsp (cd $testroot/wt && got update -c $tag > $testroot/stdout)
1557 c932eeeb 2019-05-22 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1559 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1560 c932eeeb 2019-05-22 stsp diff -u $testroot/stdout.expected $testroot/stdout
1561 c932eeeb 2019-05-22 stsp test_done "$testroot" "$ret"
1565 303e2782 2019-08-09 stsp echo "modified alpha" > $testroot/content.expected
1566 303e2782 2019-08-09 stsp cat $testroot/wt/alpha > $testroot/content
1568 303e2782 2019-08-09 stsp cmp -s $testroot/content.expected $testroot/content
1570 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1571 303e2782 2019-08-09 stsp diff -u $testroot/content.expected $testroot/content
1573 523b8417 2019-10-19 stsp test_done "$testroot" "$ret"
1576 f6cae3ed 2020-09-13 naddy test_update_toggles_xbit() {
1577 523b8417 2019-10-19 stsp local testroot=`test_init update_toggles_xbit 1`
1579 523b8417 2019-10-19 stsp touch $testroot/repo/xfile
1580 523b8417 2019-10-19 stsp chmod +x $testroot/repo/xfile
1581 523b8417 2019-10-19 stsp (cd $testroot/repo && git add .)
1582 523b8417 2019-10-19 stsp git_commit $testroot/repo -m "adding executable file"
1583 523b8417 2019-10-19 stsp local commit_id1=`git_show_head $testroot/repo`
1585 523b8417 2019-10-19 stsp got checkout $testroot/repo $testroot/wt > $testroot/stdout
1587 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1588 523b8417 2019-10-19 stsp test_done "$testroot" "$ret"
1592 523b8417 2019-10-19 stsp ls -l $testroot/wt/xfile | grep -q '^-rwx'
1594 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1595 523b8417 2019-10-19 stsp echo "file is not executable" >&2
1596 523b8417 2019-10-19 stsp ls -l $testroot/wt/xfile >&2
1597 523b8417 2019-10-19 stsp test_done "$testroot" "$ret"
1601 523b8417 2019-10-19 stsp chmod -x $testroot/wt/xfile
1602 523b8417 2019-10-19 stsp (cd $testroot/wt && got commit -m "clear x bit" >/dev/null)
1603 523b8417 2019-10-19 stsp local commit_id2=`git_show_head $testroot/repo`
1605 523b8417 2019-10-19 stsp echo "U xfile" > $testroot/stdout.expected
1606 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
1607 523b8417 2019-10-19 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1608 523b8417 2019-10-19 stsp echo >> $testroot/stdout.expected
1610 523b8417 2019-10-19 stsp (cd $testroot/wt && got update -c $commit_id1 > $testroot/stdout)
1612 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1613 523b8417 2019-10-19 stsp test_done "$testroot" "$ret"
1617 523b8417 2019-10-19 stsp echo "U xfile" > $testroot/stdout.expected
1618 4f3c844b 2021-09-14 stsp echo "Updated to refs/heads/master: $commit_id1" >> $testroot/stdout.expected
1619 523b8417 2019-10-19 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1621 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1622 523b8417 2019-10-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
1623 523b8417 2019-10-19 stsp test_done "$testroot" "$ret"
1628 523b8417 2019-10-19 stsp ls -l $testroot/wt/xfile | grep -q '^-rwx'
1630 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1631 523b8417 2019-10-19 stsp echo "file is not executable" >&2
1632 523b8417 2019-10-19 stsp ls -l $testroot/wt/xfile >&2
1633 523b8417 2019-10-19 stsp test_done "$testroot" "$ret"
1637 523b8417 2019-10-19 stsp (cd $testroot/wt && got update > $testroot/stdout)
1639 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1640 523b8417 2019-10-19 stsp test_done "$testroot" "$ret"
1644 523b8417 2019-10-19 stsp echo "U xfile" > $testroot/stdout.expected
1645 4f3c844b 2021-09-14 stsp echo "Updated to refs/heads/master: $commit_id2" \
1646 4f3c844b 2021-09-14 stsp >> $testroot/stdout.expected
1647 523b8417 2019-10-19 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1649 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1650 523b8417 2019-10-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
1651 523b8417 2019-10-19 stsp test_done "$testroot" "$ret"
1655 523b8417 2019-10-19 stsp ls -l $testroot/wt/xfile | grep -q '^-rw-'
1657 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1658 523b8417 2019-10-19 stsp echo "file is unexpectedly executable" >&2
1659 523b8417 2019-10-19 stsp ls -l $testroot/wt/xfile >&2
1661 5036ab18 2020-04-18 stsp test_done "$testroot" "$ret"
1664 f6cae3ed 2020-09-13 naddy test_update_preserves_conflicted_file() {
1665 5036ab18 2020-04-18 stsp local testroot=`test_init update_preserves_conflicted_file`
1666 5036ab18 2020-04-18 stsp local commit_id0=`git_show_head $testroot/repo`
1668 5036ab18 2020-04-18 stsp echo "modified alpha" > $testroot/repo/alpha
1669 5036ab18 2020-04-18 stsp git_commit $testroot/repo -m "modified alpha"
1670 5036ab18 2020-04-18 stsp local commit_id1=`git_show_head $testroot/repo`
1672 5036ab18 2020-04-18 stsp got checkout -c $commit_id0 $testroot/repo $testroot/wt > /dev/null
1674 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1675 5036ab18 2020-04-18 stsp test_done "$testroot" "$ret"
1679 5036ab18 2020-04-18 stsp # fake a merge conflict
1680 5036ab18 2020-04-18 stsp echo '<<<<<<<' > $testroot/wt/alpha
1681 5036ab18 2020-04-18 stsp echo 'alpha' >> $testroot/wt/alpha
1682 5036ab18 2020-04-18 stsp echo '=======' >> $testroot/wt/alpha
1683 5036ab18 2020-04-18 stsp echo 'alpha, too' >> $testroot/wt/alpha
1684 5036ab18 2020-04-18 stsp echo '>>>>>>>' >> $testroot/wt/alpha
1685 5036ab18 2020-04-18 stsp cp $testroot/wt/alpha $testroot/content.expected
1687 5036ab18 2020-04-18 stsp echo "C alpha" > $testroot/stdout.expected
1688 5036ab18 2020-04-18 stsp (cd $testroot/wt && got status > $testroot/stdout)
1689 5036ab18 2020-04-18 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1691 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1692 5036ab18 2020-04-18 stsp diff -u $testroot/stdout.expected $testroot/stdout
1693 5036ab18 2020-04-18 stsp test_done "$testroot" "$ret"
1697 5036ab18 2020-04-18 stsp echo "# alpha" > $testroot/stdout.expected
1698 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
1699 5036ab18 2020-04-18 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1700 5036ab18 2020-04-18 stsp echo >> $testroot/stdout.expected
1701 9627c110 2020-04-18 stsp echo "Files not updated because of existing merge conflicts: 1" \
1702 9627c110 2020-04-18 stsp >> $testroot/stdout.expected
1703 5036ab18 2020-04-18 stsp (cd $testroot/wt && got update > $testroot/stdout)
1705 5036ab18 2020-04-18 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1707 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1708 5036ab18 2020-04-18 stsp diff -u $testroot/stdout.expected $testroot/stdout
1709 5036ab18 2020-04-18 stsp test_done "$testroot" "$ret"
1713 5036ab18 2020-04-18 stsp cmp -s $testroot/content.expected $testroot/wt/alpha
1715 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1716 5036ab18 2020-04-18 stsp diff -u $testroot/content.expected $testroot/wt/alpha
1718 c932eeeb 2019-05-22 stsp test_done "$testroot" "$ret"
1721 f6cae3ed 2020-09-13 naddy test_update_modified_submodules() {
1722 e7303626 2020-05-14 stsp local testroot=`test_init update_modified_submodules`
1724 e7303626 2020-05-14 stsp make_single_file_repo $testroot/repo2 foo
1726 e7303626 2020-05-14 stsp (cd $testroot/repo && git submodule -q add ../repo2)
1727 e7303626 2020-05-14 stsp (cd $testroot/repo && git commit -q -m 'adding submodule')
1729 e7303626 2020-05-14 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1731 e7303626 2020-05-14 stsp echo "modified foo" > $testroot/repo2/foo
1732 e7303626 2020-05-14 stsp (cd $testroot/repo2 && git commit -q -a -m 'modified a submodule')
1734 e7303626 2020-05-14 stsp # Update the repo/repo2 submodule link
1735 e7303626 2020-05-14 stsp (cd $testroot/repo && git -C repo2 pull -q)
1736 e7303626 2020-05-14 stsp (cd $testroot/repo && git add repo2)
1737 e7303626 2020-05-14 stsp git_commit $testroot/repo -m "modified submodule link"
1739 e7303626 2020-05-14 stsp # This update only records the new base commit. Otherwise it is a
1740 e7303626 2020-05-14 stsp # no-op change because Got's file index does not track submodules.
1741 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " > $testroot/stdout.expected
1742 e7303626 2020-05-14 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1743 e7303626 2020-05-14 stsp echo >> $testroot/stdout.expected
1745 e7303626 2020-05-14 stsp (cd $testroot/wt && got update > $testroot/stdout)
1747 e7303626 2020-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1749 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1750 e7303626 2020-05-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
1752 e7303626 2020-05-14 stsp test_done "$testroot" "$ret"
1755 f6cae3ed 2020-09-13 naddy test_update_adds_submodule() {
1756 e7303626 2020-05-14 stsp local testroot=`test_init update_adds_submodule`
1758 e7303626 2020-05-14 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1760 e7303626 2020-05-14 stsp make_single_file_repo $testroot/repo2 foo
1762 e7303626 2020-05-14 stsp echo "modified foo" > $testroot/repo2/foo
1763 e7303626 2020-05-14 stsp (cd $testroot/repo2 && git commit -q -a -m 'modified a submodule')
1765 e7303626 2020-05-14 stsp (cd $testroot/repo && git submodule -q add ../repo2)
1766 e7303626 2020-05-14 stsp (cd $testroot/repo && git commit -q -m 'adding submodule')
1768 e7303626 2020-05-14 stsp echo "A .gitmodules" > $testroot/stdout.expected
1769 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
1770 e7303626 2020-05-14 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1771 e7303626 2020-05-14 stsp echo >> $testroot/stdout.expected
1773 e7303626 2020-05-14 stsp (cd $testroot/wt && got update > $testroot/stdout)
1775 e7303626 2020-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1777 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1778 e7303626 2020-05-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
1780 e7303626 2020-05-14 stsp test_done "$testroot" "$ret"
1783 f6cae3ed 2020-09-13 naddy test_update_conflict_wt_file_vs_repo_submodule() {
1784 e7303626 2020-05-14 stsp local testroot=`test_init update_conflict_wt_file_vs_repo_submodule`
1786 e7303626 2020-05-14 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1788 e7303626 2020-05-14 stsp make_single_file_repo $testroot/repo2 foo
1790 e7303626 2020-05-14 stsp # Add a file which will clash with the submodule
1791 e7303626 2020-05-14 stsp echo "This is a file called repo2" > $testroot/wt/repo2
1792 e7303626 2020-05-14 stsp (cd $testroot/wt && got add repo2 > /dev/null)
1793 e7303626 2020-05-14 stsp (cd $testroot/wt && got commit -m 'add file repo2' > /dev/null)
1795 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1796 e7303626 2020-05-14 stsp echo "commit failed unexpectedly" >&2
1797 e7303626 2020-05-14 stsp test_done "$testroot" "1"
1801 e7303626 2020-05-14 stsp (cd $testroot/repo && git submodule -q add ../repo2)
1802 e7303626 2020-05-14 stsp (cd $testroot/repo && git commit -q -m 'adding submodule')
1804 e7303626 2020-05-14 stsp # Modify the clashing file such that any modifications brought
1805 e7303626 2020-05-14 stsp # in by 'got update' would require a merge.
1806 e7303626 2020-05-14 stsp echo "This file was changed" > $testroot/wt/repo2
1808 e7303626 2020-05-14 stsp # No conflict occurs because 'got update' ignores the submodule
1809 e7303626 2020-05-14 stsp # and leaves the clashing file as it was.
1810 e7303626 2020-05-14 stsp echo "A .gitmodules" > $testroot/stdout.expected
1811 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
1812 e7303626 2020-05-14 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1813 e7303626 2020-05-14 stsp echo >> $testroot/stdout.expected
1815 e7303626 2020-05-14 stsp (cd $testroot/wt && got update > $testroot/stdout)
1817 e7303626 2020-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1819 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1820 e7303626 2020-05-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
1821 e7303626 2020-05-14 stsp test_done "$testroot" "$ret"
1825 e7303626 2020-05-14 stsp (cd $testroot/wt && got status > $testroot/stdout)
1827 e7303626 2020-05-14 stsp echo "M repo2" > $testroot/stdout.expected
1828 e7303626 2020-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1830 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1831 e7303626 2020-05-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
1833 e7303626 2020-05-14 stsp test_done "$testroot" "$ret"
1836 f6cae3ed 2020-09-13 naddy test_update_adds_symlink() {
1837 f35fa46a 2020-07-23 stsp local testroot=`test_init update_adds_symlink`
1839 f35fa46a 2020-07-23 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1841 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1842 f35fa46a 2020-07-23 stsp echo "checkout failed unexpectedly" >&2
1843 f35fa46a 2020-07-23 stsp test_done "$testroot" "$ret"
1847 f35fa46a 2020-07-23 stsp (cd $testroot/repo && ln -s alpha alpha.link)
1848 f35fa46a 2020-07-23 stsp (cd $testroot/repo && ln -s epsilon epsilon.link)
1849 f35fa46a 2020-07-23 stsp (cd $testroot/repo && ln -s /etc/passwd passwd.link)
1850 f35fa46a 2020-07-23 stsp (cd $testroot/repo && ln -s ../beta epsilon/beta.link)
1851 f35fa46a 2020-07-23 stsp (cd $testroot/repo && ln -s nonexistent nonexistent.link)
1852 f35fa46a 2020-07-23 stsp (cd $testroot/repo && git add .)
1853 f35fa46a 2020-07-23 stsp git_commit $testroot/repo -m "add symlinks"
1855 f35fa46a 2020-07-23 stsp echo "A alpha.link" > $testroot/stdout.expected
1856 f35fa46a 2020-07-23 stsp echo "A epsilon/beta.link" >> $testroot/stdout.expected
1857 f35fa46a 2020-07-23 stsp echo "A epsilon.link" >> $testroot/stdout.expected
1858 f35fa46a 2020-07-23 stsp echo "A nonexistent.link" >> $testroot/stdout.expected
1859 f35fa46a 2020-07-23 stsp echo "A passwd.link" >> $testroot/stdout.expected
1860 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
1861 f35fa46a 2020-07-23 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1862 f35fa46a 2020-07-23 stsp echo >> $testroot/stdout.expected
1864 f35fa46a 2020-07-23 stsp (cd $testroot/wt && got update > $testroot/stdout)
1866 f35fa46a 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1868 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1869 f35fa46a 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1870 f35fa46a 2020-07-23 stsp test_done "$testroot" "$ret"
1874 f35fa46a 2020-07-23 stsp if ! [ -h $testroot/wt/alpha.link ]; then
1875 f35fa46a 2020-07-23 stsp echo "alpha.link is not a symlink"
1876 f35fa46a 2020-07-23 stsp test_done "$testroot" "1"
1880 f35fa46a 2020-07-23 stsp readlink $testroot/wt/alpha.link > $testroot/stdout
1881 f35fa46a 2020-07-23 stsp echo "alpha" > $testroot/stdout.expected
1882 f35fa46a 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1884 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1885 f35fa46a 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1886 f35fa46a 2020-07-23 stsp test_done "$testroot" "$ret"
1890 f35fa46a 2020-07-23 stsp if ! [ -h $testroot/wt/epsilon.link ]; then
1891 f35fa46a 2020-07-23 stsp echo "epsilon.link is not a symlink"
1892 f35fa46a 2020-07-23 stsp test_done "$testroot" "1"
1896 f35fa46a 2020-07-23 stsp readlink $testroot/wt/epsilon.link > $testroot/stdout
1897 f35fa46a 2020-07-23 stsp echo "epsilon" > $testroot/stdout.expected
1898 f35fa46a 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1900 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1901 f35fa46a 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1902 f35fa46a 2020-07-23 stsp test_done "$testroot" "$ret"
1906 f35fa46a 2020-07-23 stsp if [ -h $testroot/wt/passwd.link ]; then
1907 f35fa46a 2020-07-23 stsp echo -n "passwd.link symlink points outside of work tree: " >&2
1908 f35fa46a 2020-07-23 stsp readlink $testroot/wt/passwd.link >&2
1909 f35fa46a 2020-07-23 stsp test_done "$testroot" "1"
1913 f35fa46a 2020-07-23 stsp echo -n "/etc/passwd" > $testroot/content.expected
1914 f35fa46a 2020-07-23 stsp cp $testroot/wt/passwd.link $testroot/content
1916 f35fa46a 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
1918 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1919 f35fa46a 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
1920 f35fa46a 2020-07-23 stsp test_done "$testroot" "$ret"
1924 f35fa46a 2020-07-23 stsp readlink $testroot/wt/epsilon/beta.link > $testroot/stdout
1925 f35fa46a 2020-07-23 stsp echo "../beta" > $testroot/stdout.expected
1926 f35fa46a 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1928 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1929 f35fa46a 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1930 f35fa46a 2020-07-23 stsp test_done "$testroot" "$ret"
1934 f35fa46a 2020-07-23 stsp readlink $testroot/wt/nonexistent.link > $testroot/stdout
1935 f35fa46a 2020-07-23 stsp echo "nonexistent" > $testroot/stdout.expected
1936 f35fa46a 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1938 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1939 f35fa46a 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1940 c6e8a826 2021-04-05 stsp test_done "$testroot" "$ret"
1944 c6e8a826 2021-04-05 stsp # Updating an up-to-date symlink should be a no-op.
1945 c6e8a826 2021-04-05 stsp echo 'Already up-to-date' > $testroot/stdout.expected
1946 c6e8a826 2021-04-05 stsp (cd $testroot/wt && got update > $testroot/stdout)
1947 c6e8a826 2021-04-05 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1949 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1950 c6e8a826 2021-04-05 stsp diff -u $testroot/stdout.expected $testroot/stdout
1952 f35fa46a 2020-07-23 stsp test_done "$testroot" "$ret"
1955 f6cae3ed 2020-09-13 naddy test_update_deletes_symlink() {
1956 993e2a1b 2020-07-23 stsp local testroot=`test_init update_deletes_symlink`
1958 993e2a1b 2020-07-23 stsp (cd $testroot/repo && ln -s alpha alpha.link)
1959 993e2a1b 2020-07-23 stsp (cd $testroot/repo && git add .)
1960 993e2a1b 2020-07-23 stsp git_commit $testroot/repo -m "add symlink"
1962 993e2a1b 2020-07-23 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1964 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1965 993e2a1b 2020-07-23 stsp echo "checkout failed unexpectedly" >&2
1966 993e2a1b 2020-07-23 stsp test_done "$testroot" "$ret"
1970 993e2a1b 2020-07-23 stsp (cd $testroot/repo && git rm -q alpha.link)
1971 993e2a1b 2020-07-23 stsp git_commit $testroot/repo -m "delete symlink"
1973 993e2a1b 2020-07-23 stsp echo "D alpha.link" > $testroot/stdout.expected
1974 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
1975 993e2a1b 2020-07-23 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1976 993e2a1b 2020-07-23 stsp echo >> $testroot/stdout.expected
1978 993e2a1b 2020-07-23 stsp (cd $testroot/wt && got update > $testroot/stdout)
1980 993e2a1b 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1982 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1983 993e2a1b 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1984 993e2a1b 2020-07-23 stsp test_done "$testroot" "$ret"
1988 993e2a1b 2020-07-23 stsp if [ -e $testroot/wt/alpha.link ]; then
1989 993e2a1b 2020-07-23 stsp echo "alpha.link still exists on disk"
1990 993e2a1b 2020-07-23 stsp test_done "$testroot" "1"
1994 993e2a1b 2020-07-23 stsp test_done "$testroot" "0"
1997 f6cae3ed 2020-09-13 naddy test_update_symlink_conflicts() {
1998 993e2a1b 2020-07-23 stsp local testroot=`test_init update_symlink_conflicts`
2000 993e2a1b 2020-07-23 stsp (cd $testroot/repo && ln -s alpha alpha.link)
2001 993e2a1b 2020-07-23 stsp (cd $testroot/repo && ln -s epsilon epsilon.link)
2002 993e2a1b 2020-07-23 stsp (cd $testroot/repo && ln -s /etc/passwd passwd.link)
2003 993e2a1b 2020-07-23 stsp (cd $testroot/repo && ln -s ../beta epsilon/beta.link)
2004 993e2a1b 2020-07-23 stsp (cd $testroot/repo && ln -s nonexistent nonexistent.link)
2005 993e2a1b 2020-07-23 stsp (cd $testroot/repo && ln -sf epsilon/zeta zeta.link)
2006 993e2a1b 2020-07-23 stsp (cd $testroot/repo && git add .)
2007 993e2a1b 2020-07-23 stsp git_commit $testroot/repo -m "add symlinks"
2008 993e2a1b 2020-07-23 stsp local commit_id1=`git_show_head $testroot/repo`
2010 993e2a1b 2020-07-23 stsp got checkout $testroot/repo $testroot/wt > /dev/null
2012 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2013 993e2a1b 2020-07-23 stsp echo "checkout failed unexpectedly" >&2
2014 993e2a1b 2020-07-23 stsp test_done "$testroot" "$ret"
2018 993e2a1b 2020-07-23 stsp (cd $testroot/repo && ln -sf beta alpha.link)
2019 dd6165e4 2021-09-21 thomas.ad (cd $testroot/repo && ln -sfT gamma epsilon.link)
2020 993e2a1b 2020-07-23 stsp (cd $testroot/repo && ln -sf ../gamma/delta epsilon/beta.link)
2021 993e2a1b 2020-07-23 stsp echo 'this is regular file foo' > $testroot/repo/dotgotfoo.link
2022 993e2a1b 2020-07-23 stsp (cd $testroot/repo && ln -sf .got/bar dotgotbar.link)
2023 993e2a1b 2020-07-23 stsp (cd $testroot/repo && git rm -q nonexistent.link)
2024 993e2a1b 2020-07-23 stsp (cd $testroot/repo && ln -sf gamma/delta zeta.link)
2025 993e2a1b 2020-07-23 stsp (cd $testroot/repo && ln -sf alpha new.link)
2026 993e2a1b 2020-07-23 stsp (cd $testroot/repo && git add .)
2027 993e2a1b 2020-07-23 stsp git_commit $testroot/repo -m "change symlinks"
2028 993e2a1b 2020-07-23 stsp local commit_id2=`git_show_head $testroot/repo`
2030 993e2a1b 2020-07-23 stsp # modified symlink to file A vs modified symlink to file B
2031 993e2a1b 2020-07-23 stsp (cd $testroot/wt && ln -sf gamma/delta alpha.link)
2032 993e2a1b 2020-07-23 stsp # modified symlink to dir A vs modified symlink to file B
2033 dd6165e4 2021-09-21 thomas.ad (cd $testroot/wt && ln -sfT beta epsilon.link)
2034 993e2a1b 2020-07-23 stsp # modeified symlink to file A vs modified symlink to dir B
2035 dd6165e4 2021-09-21 thomas.ad (cd $testroot/wt && ln -sfT ../gamma epsilon/beta.link)
2036 993e2a1b 2020-07-23 stsp # added regular file A vs added bad symlink to file A
2037 993e2a1b 2020-07-23 stsp (cd $testroot/wt && ln -sf .got/bar dotgotfoo.link)
2038 3b9f0f87 2020-07-23 stsp (cd $testroot/wt && got add dotgotfoo.link > /dev/null)
2039 993e2a1b 2020-07-23 stsp # added bad symlink to file A vs added regular file A
2040 993e2a1b 2020-07-23 stsp echo 'this is regular file bar' > $testroot/wt/dotgotbar.link
2041 3b9f0f87 2020-07-23 stsp (cd $testroot/wt && got add dotgotbar.link > /dev/null)
2042 993e2a1b 2020-07-23 stsp # removed symlink to non-existent file A vs modified symlink
2043 993e2a1b 2020-07-23 stsp # to nonexistent file B
2044 993e2a1b 2020-07-23 stsp (cd $testroot/wt && ln -sf nonexistent2 nonexistent.link)
2045 993e2a1b 2020-07-23 stsp # modified symlink to file A vs removed symlink to file A
2046 993e2a1b 2020-07-23 stsp (cd $testroot/wt && got rm zeta.link > /dev/null)
2047 993e2a1b 2020-07-23 stsp # added symlink to file A vs added symlink to file B
2048 993e2a1b 2020-07-23 stsp (cd $testroot/wt && ln -sf beta new.link)
2049 993e2a1b 2020-07-23 stsp (cd $testroot/wt && got add new.link > /dev/null)
2051 993e2a1b 2020-07-23 stsp (cd $testroot/wt && got update > $testroot/stdout)
2053 993e2a1b 2020-07-23 stsp echo "C alpha.link" >> $testroot/stdout.expected
2054 3b9f0f87 2020-07-23 stsp echo "C dotgotbar.link" >> $testroot/stdout.expected
2055 3b9f0f87 2020-07-23 stsp echo "C dotgotfoo.link" >> $testroot/stdout.expected
2056 993e2a1b 2020-07-23 stsp echo "C epsilon/beta.link" >> $testroot/stdout.expected
2057 993e2a1b 2020-07-23 stsp echo "C epsilon.link" >> $testroot/stdout.expected
2058 993e2a1b 2020-07-23 stsp echo "C new.link" >> $testroot/stdout.expected
2059 993e2a1b 2020-07-23 stsp echo "C nonexistent.link" >> $testroot/stdout.expected
2060 993e2a1b 2020-07-23 stsp echo "G zeta.link" >> $testroot/stdout.expected
2061 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
2062 993e2a1b 2020-07-23 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
2063 993e2a1b 2020-07-23 stsp echo >> $testroot/stdout.expected
2064 3b9f0f87 2020-07-23 stsp echo "Files with new merge conflicts: 7" >> $testroot/stdout.expected
2066 993e2a1b 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2068 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2069 993e2a1b 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2070 993e2a1b 2020-07-23 stsp test_done "$testroot" "$ret"
2074 993e2a1b 2020-07-23 stsp if [ -h $testroot/wt/alpha.link ]; then
2075 993e2a1b 2020-07-23 stsp echo "alpha.link is a symlink"
2076 993e2a1b 2020-07-23 stsp test_done "$testroot" "1"
2080 993e2a1b 2020-07-23 stsp echo "<<<<<<< merged change: commit $commit_id2" \
2081 283102fc 2020-07-23 stsp > $testroot/content.expected
2082 993e2a1b 2020-07-23 stsp echo "beta" >> $testroot/content.expected
2083 993e2a1b 2020-07-23 stsp echo "3-way merge base: commit $commit_id1" \
2084 993e2a1b 2020-07-23 stsp >> $testroot/content.expected
2085 993e2a1b 2020-07-23 stsp echo "alpha" >> $testroot/content.expected
2086 993e2a1b 2020-07-23 stsp echo "=======" >> $testroot/content.expected
2087 993e2a1b 2020-07-23 stsp echo "gamma/delta" >> $testroot/content.expected
2088 993e2a1b 2020-07-23 stsp echo '>>>>>>>' >> $testroot/content.expected
2089 993e2a1b 2020-07-23 stsp echo -n "" >> $testroot/content.expected
2091 993e2a1b 2020-07-23 stsp cp $testroot/wt/alpha.link $testroot/content
2092 993e2a1b 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2094 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2095 993e2a1b 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2096 993e2a1b 2020-07-23 stsp test_done "$testroot" "$ret"
2100 993e2a1b 2020-07-23 stsp if [ -h $testroot/wt/epsilon.link ]; then
2101 993e2a1b 2020-07-23 stsp echo "epsilon.link is a symlink"
2102 993e2a1b 2020-07-23 stsp test_done "$testroot" "1"
2106 993e2a1b 2020-07-23 stsp echo "<<<<<<< merged change: commit $commit_id2" \
2107 283102fc 2020-07-23 stsp > $testroot/content.expected
2108 993e2a1b 2020-07-23 stsp echo "gamma" >> $testroot/content.expected
2109 993e2a1b 2020-07-23 stsp echo "3-way merge base: commit $commit_id1" \
2110 993e2a1b 2020-07-23 stsp >> $testroot/content.expected
2111 993e2a1b 2020-07-23 stsp echo "epsilon" >> $testroot/content.expected
2112 993e2a1b 2020-07-23 stsp echo "=======" >> $testroot/content.expected
2113 993e2a1b 2020-07-23 stsp echo "beta" >> $testroot/content.expected
2114 993e2a1b 2020-07-23 stsp echo '>>>>>>>' >> $testroot/content.expected
2115 993e2a1b 2020-07-23 stsp echo -n "" >> $testroot/content.expected
2117 993e2a1b 2020-07-23 stsp cp $testroot/wt/epsilon.link $testroot/content
2118 993e2a1b 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2120 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2121 993e2a1b 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2122 993e2a1b 2020-07-23 stsp test_done "$testroot" "$ret"
2126 993e2a1b 2020-07-23 stsp if [ -h $testroot/wt/passwd.link ]; then
2127 993e2a1b 2020-07-23 stsp echo -n "passwd.link symlink points outside of work tree: " >&2
2128 993e2a1b 2020-07-23 stsp readlink $testroot/wt/passwd.link >&2
2129 993e2a1b 2020-07-23 stsp test_done "$testroot" "1"
2133 993e2a1b 2020-07-23 stsp echo -n "/etc/passwd" > $testroot/content.expected
2134 993e2a1b 2020-07-23 stsp cp $testroot/wt/passwd.link $testroot/content
2136 993e2a1b 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2138 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2139 993e2a1b 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2140 993e2a1b 2020-07-23 stsp test_done "$testroot" "$ret"
2144 993e2a1b 2020-07-23 stsp if [ -h $testroot/wt/epsilon/beta.link ]; then
2145 993e2a1b 2020-07-23 stsp echo "epsilon/beta.link is a symlink"
2146 993e2a1b 2020-07-23 stsp test_done "$testroot" "1"
2150 993e2a1b 2020-07-23 stsp echo "<<<<<<< merged change: commit $commit_id2" \
2151 283102fc 2020-07-23 stsp > $testroot/content.expected
2152 993e2a1b 2020-07-23 stsp echo "../gamma/delta" >> $testroot/content.expected
2153 993e2a1b 2020-07-23 stsp echo "3-way merge base: commit $commit_id1" \
2154 993e2a1b 2020-07-23 stsp >> $testroot/content.expected
2155 993e2a1b 2020-07-23 stsp echo "../beta" >> $testroot/content.expected
2156 993e2a1b 2020-07-23 stsp echo "=======" >> $testroot/content.expected
2157 993e2a1b 2020-07-23 stsp echo "../gamma" >> $testroot/content.expected
2158 993e2a1b 2020-07-23 stsp echo '>>>>>>>' >> $testroot/content.expected
2159 993e2a1b 2020-07-23 stsp echo -n "" >> $testroot/content.expected
2161 993e2a1b 2020-07-23 stsp cp $testroot/wt/epsilon/beta.link $testroot/content
2162 993e2a1b 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2164 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2165 993e2a1b 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2166 993e2a1b 2020-07-23 stsp test_done "$testroot" "$ret"
2170 993e2a1b 2020-07-23 stsp if [ -h $testroot/wt/nonexistent.link ]; then
2171 993e2a1b 2020-07-23 stsp echo -n "nonexistent.link still exists on disk: " >&2
2172 993e2a1b 2020-07-23 stsp readlink $testroot/wt/nonexistent.link >&2
2173 993e2a1b 2020-07-23 stsp test_done "$testroot" "1"
2177 993e2a1b 2020-07-23 stsp echo "<<<<<<< merged change: commit $commit_id2" \
2178 283102fc 2020-07-23 stsp > $testroot/content.expected
2179 993e2a1b 2020-07-23 stsp echo "(symlink was deleted)" >> $testroot/content.expected
2180 993e2a1b 2020-07-23 stsp echo "=======" >> $testroot/content.expected
2181 993e2a1b 2020-07-23 stsp echo "nonexistent2" >> $testroot/content.expected
2182 993e2a1b 2020-07-23 stsp echo '>>>>>>>' >> $testroot/content.expected
2183 993e2a1b 2020-07-23 stsp echo -n "" >> $testroot/content.expected
2185 993e2a1b 2020-07-23 stsp cp $testroot/wt/nonexistent.link $testroot/content
2186 993e2a1b 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2188 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2189 993e2a1b 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2190 993e2a1b 2020-07-23 stsp test_done "$testroot" "$ret"
2194 993e2a1b 2020-07-23 stsp if [ -h $testroot/wt/dotgotfoo.link ]; then
2195 993e2a1b 2020-07-23 stsp echo "dotgotfoo.link is a symlink"
2196 993e2a1b 2020-07-23 stsp test_done "$testroot" "1"
2200 3b9f0f87 2020-07-23 stsp echo "<<<<<<< merged change: commit $commit_id2" \
2201 3b9f0f87 2020-07-23 stsp > $testroot/content.expected
2202 3b9f0f87 2020-07-23 stsp echo "this is regular file foo" >> $testroot/content.expected
2203 3b9f0f87 2020-07-23 stsp echo "=======" >> $testroot/content.expected
2204 3b9f0f87 2020-07-23 stsp echo -n ".got/bar" >> $testroot/content.expected
2205 3b9f0f87 2020-07-23 stsp echo '>>>>>>>' >> $testroot/content.expected
2206 3b9f0f87 2020-07-23 stsp echo -n "" >> $testroot/content.expected
2208 993e2a1b 2020-07-23 stsp cp $testroot/wt/dotgotfoo.link $testroot/content
2209 993e2a1b 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2211 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2212 993e2a1b 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2213 993e2a1b 2020-07-23 stsp test_done "$testroot" "$ret"
2217 993e2a1b 2020-07-23 stsp if [ -h $testroot/wt/dotgotbar.link ]; then
2218 993e2a1b 2020-07-23 stsp echo "dotgotbar.link is a symlink"
2219 993e2a1b 2020-07-23 stsp test_done "$testroot" "1"
2222 3b9f0f87 2020-07-23 stsp echo "<<<<<<< merged change: commit $commit_id2" \
2223 3b9f0f87 2020-07-23 stsp > $testroot/content.expected
2224 3b9f0f87 2020-07-23 stsp echo -n ".got/bar" >> $testroot/content.expected
2225 3b9f0f87 2020-07-23 stsp echo "=======" >> $testroot/content.expected
2226 3b9f0f87 2020-07-23 stsp echo "this is regular file bar" >> $testroot/content.expected
2227 3b9f0f87 2020-07-23 stsp echo '>>>>>>>' >> $testroot/content.expected
2228 3b9f0f87 2020-07-23 stsp echo -n "" >> $testroot/content.expected
2230 993e2a1b 2020-07-23 stsp cp $testroot/wt/dotgotbar.link $testroot/content
2231 993e2a1b 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2233 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2234 993e2a1b 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2235 993e2a1b 2020-07-23 stsp test_done "$testroot" "$ret"
2239 993e2a1b 2020-07-23 stsp if [ -h $testroot/wt/new.link ]; then
2240 993e2a1b 2020-07-23 stsp echo "new.link is a symlink"
2241 993e2a1b 2020-07-23 stsp test_done "$testroot" "1"
2245 993e2a1b 2020-07-23 stsp echo "<<<<<<< merged change: commit $commit_id2" \
2246 283102fc 2020-07-23 stsp > $testroot/content.expected
2247 993e2a1b 2020-07-23 stsp echo "alpha" >> $testroot/content.expected
2248 993e2a1b 2020-07-23 stsp echo "=======" >> $testroot/content.expected
2249 993e2a1b 2020-07-23 stsp echo "beta" >> $testroot/content.expected
2250 993e2a1b 2020-07-23 stsp echo '>>>>>>>' >> $testroot/content.expected
2251 993e2a1b 2020-07-23 stsp echo -n "" >> $testroot/content.expected
2253 993e2a1b 2020-07-23 stsp cp $testroot/wt/new.link $testroot/content
2254 993e2a1b 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2256 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2257 993e2a1b 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2258 993e2a1b 2020-07-23 stsp test_done "$testroot" "$ret"
2262 993e2a1b 2020-07-23 stsp echo "A dotgotfoo.link" > $testroot/stdout.expected
2263 993e2a1b 2020-07-23 stsp echo "M new.link" >> $testroot/stdout.expected
2264 993e2a1b 2020-07-23 stsp echo "D nonexistent.link" >> $testroot/stdout.expected
2265 993e2a1b 2020-07-23 stsp (cd $testroot/wt && got status > $testroot/stdout)
2266 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2267 993e2a1b 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2268 993e2a1b 2020-07-23 stsp test_done "$testroot" "$ret"
2272 993e2a1b 2020-07-23 stsp test_done "$testroot" "0"
2276 194cb7cb 2021-01-19 stsp test_update_single_file() {
2277 194cb7cb 2021-01-19 stsp local testroot=`test_init update_single_file 1`
2279 194cb7cb 2021-01-19 stsp echo c1 > $testroot/repo/c
2280 194cb7cb 2021-01-19 stsp (cd $testroot/repo && git add .)
2281 79775c2f 2021-01-19 stsp git_commit $testroot/repo -m "adding file c"
2282 194cb7cb 2021-01-19 stsp local commit_id1=`git_show_head $testroot/repo`
2284 194cb7cb 2021-01-19 stsp echo a > $testroot/repo/a
2285 194cb7cb 2021-01-19 stsp echo b > $testroot/repo/b
2286 194cb7cb 2021-01-19 stsp echo c2 > $testroot/repo/c
2287 194cb7cb 2021-01-19 stsp (cd $testroot/repo && git add .)
2288 79775c2f 2021-01-19 stsp git_commit $testroot/repo -m "add files a and b, change c"
2289 194cb7cb 2021-01-19 stsp local commit_id2=`git_show_head $testroot/repo`
2291 d51387a0 2021-01-19 stsp (cd $testroot/repo && git rm -qf c)
2292 d51387a0 2021-01-19 stsp git_commit $testroot/repo -m "remove file c"
2293 d51387a0 2021-01-19 stsp local commit_id3=`git_show_head $testroot/repo`
2295 d51387a0 2021-01-19 stsp got checkout -c $commit_id2 $testroot/repo $testroot/wt > /dev/null
2297 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2298 194cb7cb 2021-01-19 stsp test_done "$testroot" "$ret"
2302 194cb7cb 2021-01-19 stsp echo "U c" > $testroot/stdout.expected
2303 4f3c844b 2021-09-14 stsp echo "Updated to refs/heads/master: $commit_id1" \
2304 4f3c844b 2021-09-14 stsp >> $testroot/stdout.expected
2306 194cb7cb 2021-01-19 stsp (cd $testroot/wt && got update -c $commit_id1 c \
2307 194cb7cb 2021-01-19 stsp > $testroot/stdout)
2309 194cb7cb 2021-01-19 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2311 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2312 194cb7cb 2021-01-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
2313 194cb7cb 2021-01-19 stsp test_done "$testroot" "$ret"
2317 194cb7cb 2021-01-19 stsp echo c1 > $testroot/content.expected
2318 194cb7cb 2021-01-19 stsp cat $testroot/wt/c > $testroot/content
2320 194cb7cb 2021-01-19 stsp cmp -s $testroot/content.expected $testroot/content
2322 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2323 194cb7cb 2021-01-19 stsp diff -u $testroot/content.expected $testroot/content
2324 194cb7cb 2021-01-19 stsp test_done "$testroot" "$ret"
2328 194cb7cb 2021-01-19 stsp echo "U c" > $testroot/stdout.expected
2329 4f3c844b 2021-09-14 stsp echo "Updated to refs/heads/master: $commit_id2" \
2330 4f3c844b 2021-09-14 stsp >> $testroot/stdout.expected
2332 d51387a0 2021-01-19 stsp (cd $testroot/wt && got update -c $commit_id2 c > $testroot/stdout)
2334 194cb7cb 2021-01-19 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2336 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2337 194cb7cb 2021-01-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
2338 194cb7cb 2021-01-19 stsp test_done "$testroot" "$ret"
2342 194cb7cb 2021-01-19 stsp echo c2 > $testroot/content.expected
2343 194cb7cb 2021-01-19 stsp cat $testroot/wt/c > $testroot/content
2345 194cb7cb 2021-01-19 stsp cmp -s $testroot/content.expected $testroot/content
2347 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2348 194cb7cb 2021-01-19 stsp diff -u $testroot/content.expected $testroot/content
2349 d51387a0 2021-01-19 stsp test_done "$testroot" "$ret"
2353 d51387a0 2021-01-19 stsp echo "D c" > $testroot/stdout.expected
2354 4f3c844b 2021-09-14 stsp echo "Updated to refs/heads/master: $commit_id3" \
2355 4f3c844b 2021-09-14 stsp >> $testroot/stdout.expected
2357 d51387a0 2021-01-19 stsp (cd $testroot/wt && got update -c $commit_id3 c \
2358 d51387a0 2021-01-19 stsp > $testroot/stdout 2> $testroot/stderr)
2360 d51387a0 2021-01-19 stsp echo "got: /c: no such entry found in tree" > $testroot/stderr.expected
2361 d51387a0 2021-01-19 stsp cmp -s $testroot/stderr.expected $testroot/stderr
2363 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2364 d51387a0 2021-01-19 stsp diff -u $testroot/stderr.expected $testroot/stderr
2365 d51387a0 2021-01-19 stsp test_done "$testroot" "$ret"
2369 d51387a0 2021-01-19 stsp echo -n > $testroot/stdout.expected
2370 d51387a0 2021-01-19 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2372 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2373 d51387a0 2021-01-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
2374 d51387a0 2021-01-19 stsp test_done "$testroot" "$ret"
2378 d51387a0 2021-01-19 stsp echo "D c" > $testroot/stdout.expected
2379 4f3c844b 2021-09-14 stsp echo "Updated to refs/heads/master: $commit_id3" \
2380 4f3c844b 2021-09-14 stsp >> $testroot/stdout.expected
2382 d51387a0 2021-01-19 stsp (cd $testroot/wt && got update -c $commit_id3 > $testroot/stdout)
2383 d51387a0 2021-01-19 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2385 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2386 d51387a0 2021-01-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
2387 d51387a0 2021-01-19 stsp test_done "$testroot" "$ret"
2391 d51387a0 2021-01-19 stsp if [ -e $testroot/wt/c ]; then
2392 d51387a0 2021-01-19 stsp echo "removed file c still exists on disk" >&2
2393 d51387a0 2021-01-19 stsp test_done "$testroot" "1"
2397 d51387a0 2021-01-19 stsp test_done "$testroot" "0"
2401 a769b60b 2021-06-27 stsp test_update_file_skipped_due_to_conflict() {
2402 a769b60b 2021-06-27 stsp local testroot=`test_init update_file_skipped_due_to_conflict`
2403 a769b60b 2021-06-27 stsp local commit_id0=`git_show_head $testroot/repo`
2404 a769b60b 2021-06-27 stsp blob_id0=`get_blob_id $testroot/repo "" beta`
2406 a769b60b 2021-06-27 stsp echo "changed beta" > $testroot/repo/beta
2407 a769b60b 2021-06-27 stsp git_commit $testroot/repo -m "changed beta"
2408 a769b60b 2021-06-27 stsp local commit_id1=`git_show_head $testroot/repo`
2409 a769b60b 2021-06-27 stsp blob_id1=`get_blob_id $testroot/repo "" beta`
2411 a769b60b 2021-06-27 stsp got checkout $testroot/repo $testroot/wt > /dev/null
2413 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2414 a769b60b 2021-06-27 stsp test_done "$testroot" "$ret"
2418 a769b60b 2021-06-27 stsp blob_id=`(cd $testroot/wt && got info beta | grep 'blob:' | \
2419 a769b60b 2021-06-27 stsp cut -d ':' -f 2 | tr -d ' ')`
2420 a769b60b 2021-06-27 stsp if [ "$blob_id" != "$blob_id1" ]; then
2421 a769b60b 2021-06-27 stsp echo "file beta has the wrong base blob ID" >&2
2422 a769b60b 2021-06-27 stsp test_done "$testroot" "1"
2426 a769b60b 2021-06-27 stsp commit_id=`(cd $testroot/wt && got info beta | \
2427 a769b60b 2021-06-27 stsp grep 'based on commit:' | cut -d ':' -f 2 | tr -d ' ')`
2428 a769b60b 2021-06-27 stsp if [ "$commit_id" != "$commit_id1" ]; then
2429 a769b60b 2021-06-27 stsp echo "file beta has the wrong base commit ID" >&2
2430 a769b60b 2021-06-27 stsp test_done "$testroot" "1"
2434 a769b60b 2021-06-27 stsp echo "modified beta" > $testroot/wt/beta
2436 a769b60b 2021-06-27 stsp (cd $testroot/wt && got update -c $commit_id0 > $testroot/stdout)
2438 a769b60b 2021-06-27 stsp echo "C beta" > $testroot/stdout.expected
2439 4f3c844b 2021-09-14 stsp echo "Updated to refs/heads/master: $commit_id0" \
2440 4f3c844b 2021-09-14 stsp >> $testroot/stdout.expected
2441 a769b60b 2021-06-27 stsp echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
2442 a769b60b 2021-06-27 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2444 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2445 a769b60b 2021-06-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
2446 a769b60b 2021-06-27 stsp test_done "$testroot" "$ret"
2450 a769b60b 2021-06-27 stsp echo "<<<<<<< merged change: commit $commit_id0" \
2451 a769b60b 2021-06-27 stsp > $testroot/content.expected
2452 a769b60b 2021-06-27 stsp echo "beta" >> $testroot/content.expected
2453 a769b60b 2021-06-27 stsp echo "||||||| 3-way merge base: commit $commit_id1" \
2454 a769b60b 2021-06-27 stsp >> $testroot/content.expected
2455 a769b60b 2021-06-27 stsp echo "changed beta" >> $testroot/content.expected
2456 a769b60b 2021-06-27 stsp echo "=======" >> $testroot/content.expected
2457 a769b60b 2021-06-27 stsp echo "modified beta" >> $testroot/content.expected
2458 a769b60b 2021-06-27 stsp echo ">>>>>>>" >> $testroot/content.expected
2460 a769b60b 2021-06-27 stsp cat $testroot/wt/beta > $testroot/content
2462 a769b60b 2021-06-27 stsp cmp -s $testroot/content.expected $testroot/content
2464 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2465 a769b60b 2021-06-27 stsp diff -u $testroot/content.expected $testroot/content
2466 a769b60b 2021-06-27 stsp test_done "$testroot" "$ret"
2470 a769b60b 2021-06-27 stsp blob_id=`(cd $testroot/wt && got info beta | grep 'blob:' | \
2471 a769b60b 2021-06-27 stsp cut -d ':' -f 2 | tr -d ' ')`
2472 a769b60b 2021-06-27 stsp if [ "$blob_id" != "$blob_id0" ]; then
2473 a769b60b 2021-06-27 stsp echo "file beta has the wrong base blob ID" >&2
2474 a769b60b 2021-06-27 stsp test_done "$testroot" "1"
2478 a769b60b 2021-06-27 stsp commit_id=`(cd $testroot/wt && got info beta | \
2479 a769b60b 2021-06-27 stsp grep 'based on commit:' | cut -d ':' -f 2 | tr -d ' ')`
2480 a769b60b 2021-06-27 stsp if [ "$commit_id" != "$commit_id0" ]; then
2481 a769b60b 2021-06-27 stsp echo "file beta has the wrong base commit ID" >&2
2482 a769b60b 2021-06-27 stsp test_done "$testroot" "1"
2486 a769b60b 2021-06-27 stsp # update to the latest commit again; this skips beta
2487 a769b60b 2021-06-27 stsp (cd $testroot/wt && got update > $testroot/stdout)
2488 a769b60b 2021-06-27 stsp echo "# beta" > $testroot/stdout.expected
2489 4f3c844b 2021-09-14 stsp echo "Updated to refs/heads/master: $commit_id1" \
2490 4f3c844b 2021-09-14 stsp >> $testroot/stdout.expected
2491 a769b60b 2021-06-27 stsp echo "Files not updated because of existing merge conflicts: 1" \
2492 a769b60b 2021-06-27 stsp >> $testroot/stdout.expected
2493 a769b60b 2021-06-27 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2495 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2496 a769b60b 2021-06-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
2497 a769b60b 2021-06-27 stsp test_done "$testroot" "$ret"
2501 a769b60b 2021-06-27 stsp # blob ID of beta should not have changed
2502 a769b60b 2021-06-27 stsp blob_id=`(cd $testroot/wt && got info beta | grep 'blob:' | \
2503 a769b60b 2021-06-27 stsp cut -d ':' -f 2 | tr -d ' ')`
2504 a769b60b 2021-06-27 stsp if [ "$blob_id" != "$blob_id0" ]; then
2505 a769b60b 2021-06-27 stsp echo "file beta has the wrong base blob ID" >&2
2506 a769b60b 2021-06-27 stsp test_done "$testroot" "1"
2510 a769b60b 2021-06-27 stsp # commit ID of beta should not have changed; There was a bug
2511 a769b60b 2021-06-27 stsp # here where the commit ID had been changed even though the
2512 a769b60b 2021-06-27 stsp # file was not updated.
2513 a769b60b 2021-06-27 stsp commit_id=`(cd $testroot/wt && got info beta | \
2514 a769b60b 2021-06-27 stsp grep 'based on commit:' | cut -d ':' -f 2 | tr -d ' ')`
2515 a769b60b 2021-06-27 stsp if [ "$commit_id" != "$commit_id0" ]; then
2516 a769b60b 2021-06-27 stsp echo "file beta has the wrong base commit ID: $commit_id" >&2
2517 a769b60b 2021-06-27 stsp test_done "$testroot" "1"
2521 a769b60b 2021-06-27 stsp # beta is still conflicted and based on commit 0
2522 a769b60b 2021-06-27 stsp echo 'C beta' > $testroot/stdout.expected
2523 a769b60b 2021-06-27 stsp (cd $testroot/wt && got status > $testroot/stdout)
2524 a769b60b 2021-06-27 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2526 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2527 a769b60b 2021-06-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
2528 a769b60b 2021-06-27 stsp test_done "$testroot" "$ret"
2532 a769b60b 2021-06-27 stsp # resolve the conflict via revert
2533 a769b60b 2021-06-27 stsp (cd $testroot/wt && got revert beta >/dev/null)
2535 a769b60b 2021-06-27 stsp # beta now matches its base blob which is still from commit 0
2536 a769b60b 2021-06-27 stsp echo "beta" > $testroot/content.expected
2537 a769b60b 2021-06-27 stsp cat $testroot/wt/beta > $testroot/content
2538 a769b60b 2021-06-27 stsp cmp -s $testroot/content.expected $testroot/content
2540 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2541 a769b60b 2021-06-27 stsp diff -u $testroot/content.expected $testroot/content
2542 a769b60b 2021-06-27 stsp test_done "$testroot" "$ret"
2546 a769b60b 2021-06-27 stsp # updating to the latest commit should now update beta
2547 a769b60b 2021-06-27 stsp (cd $testroot/wt && got update > $testroot/stdout)
2548 a769b60b 2021-06-27 stsp echo "U beta" > $testroot/stdout.expected
2549 4f3c844b 2021-09-14 stsp echo "Updated to refs/heads/master: $commit_id1" \
2550 4f3c844b 2021-09-14 stsp >> $testroot/stdout.expected
2551 2c41dce7 2021-06-27 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2553 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2554 2c41dce7 2021-06-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
2555 2c41dce7 2021-06-27 stsp test_done "$testroot" "$ret"
2559 2c41dce7 2021-06-27 stsp blob_id=`(cd $testroot/wt && got info beta | grep 'blob:' | \
2560 2c41dce7 2021-06-27 stsp cut -d ':' -f 2 | tr -d ' ')`
2561 2c41dce7 2021-06-27 stsp if [ "$blob_id" != "$blob_id1" ]; then
2562 2c41dce7 2021-06-27 stsp echo "file beta has the wrong base blob ID" >&2
2563 2c41dce7 2021-06-27 stsp test_done "$testroot" "1"
2567 2c41dce7 2021-06-27 stsp commit_id=`(cd $testroot/wt && got info beta | \
2568 2c41dce7 2021-06-27 stsp grep 'based on commit:' | cut -d ':' -f 2 | tr -d ' ')`
2569 2c41dce7 2021-06-27 stsp if [ "$commit_id" != "$commit_id1" ]; then
2570 2c41dce7 2021-06-27 stsp echo "file beta has the wrong base commit ID: $commit_id" >&2
2571 2c41dce7 2021-06-27 stsp test_done "$testroot" "1"
2575 2c41dce7 2021-06-27 stsp echo "changed beta" > $testroot/content.expected
2576 2c41dce7 2021-06-27 stsp cat $testroot/wt/beta > $testroot/content
2577 2c41dce7 2021-06-27 stsp cmp -s $testroot/content.expected $testroot/content
2579 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2580 2c41dce7 2021-06-27 stsp diff -u $testroot/content.expected $testroot/content
2582 2c41dce7 2021-06-27 stsp test_done "$testroot" "$ret"
2585 2c41dce7 2021-06-27 stsp test_update_file_skipped_due_to_obstruction() {
2586 2c41dce7 2021-06-27 stsp local testroot=`test_init update_file_skipped_due_to_obstruction`
2587 2c41dce7 2021-06-27 stsp local commit_id0=`git_show_head $testroot/repo`
2588 2c41dce7 2021-06-27 stsp blob_id0=`get_blob_id $testroot/repo "" beta`
2590 2c41dce7 2021-06-27 stsp echo "changed beta" > $testroot/repo/beta
2591 e6f4ba31 2021-09-24 thomas echo "new file" > $testroot/repo/new
2592 e6f4ba31 2021-09-24 thomas (cd $testroot/repo && git add new)
2593 2c41dce7 2021-06-27 stsp git_commit $testroot/repo -m "changed beta"
2594 2c41dce7 2021-06-27 stsp local commit_id1=`git_show_head $testroot/repo`
2595 2c41dce7 2021-06-27 stsp blob_id1=`get_blob_id $testroot/repo "" beta`
2597 2c41dce7 2021-06-27 stsp got checkout -c $commit_id0 $testroot/repo $testroot/wt > /dev/null
2599 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2600 2c41dce7 2021-06-27 stsp test_done "$testroot" "$ret"
2604 2c41dce7 2021-06-27 stsp blob_id=`(cd $testroot/wt && got info beta | grep 'blob:' | \
2605 2c41dce7 2021-06-27 stsp cut -d ':' -f 2 | tr -d ' ')`
2606 2c41dce7 2021-06-27 stsp if [ "$blob_id" != "$blob_id0" ]; then
2607 2c41dce7 2021-06-27 stsp echo "file beta has the wrong base blob ID" >&2
2608 2c41dce7 2021-06-27 stsp test_done "$testroot" "1"
2612 2c41dce7 2021-06-27 stsp commit_id=`(cd $testroot/wt && got info beta | \
2613 2c41dce7 2021-06-27 stsp grep 'based on commit:' | cut -d ':' -f 2 | tr -d ' ')`
2614 2c41dce7 2021-06-27 stsp if [ "$commit_id" != "$commit_id0" ]; then
2615 2c41dce7 2021-06-27 stsp echo "file beta has the wrong base commit ID" >&2
2616 2c41dce7 2021-06-27 stsp test_done "$testroot" "1"
2620 2c41dce7 2021-06-27 stsp rm $testroot/wt/beta
2621 2c41dce7 2021-06-27 stsp mkdir -p $testroot/wt/beta/psi
2622 e6f4ba31 2021-09-24 thomas mkdir -p $testroot/wt/new
2624 e6f4ba31 2021-09-24 thomas # update to the latest commit; this skips beta and the new file
2625 2c41dce7 2021-06-27 stsp (cd $testroot/wt && got update > $testroot/stdout)
2627 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2628 e6f4ba31 2021-09-24 thomas echo "update failed unexpectedly" >&2
2629 e6f4ba31 2021-09-24 thomas test_done "$testroot" "1"
2630 e6f4ba31 2021-09-24 thomas return 1
2633 2c41dce7 2021-06-27 stsp echo "~ beta" > $testroot/stdout.expected
2634 e6f4ba31 2021-09-24 thomas echo "~ new" >> $testroot/stdout.expected
2635 4f3c844b 2021-09-14 stsp echo "Updated to refs/heads/master: $commit_id1" \
2636 4f3c844b 2021-09-14 stsp >> $testroot/stdout.expected
2637 e6f4ba31 2021-09-24 thomas echo "File paths obstructed by a non-regular file: 2" \
2638 4f3c844b 2021-09-14 stsp >> $testroot/stdout.expected
2639 a769b60b 2021-06-27 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2641 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2642 a769b60b 2021-06-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
2643 a769b60b 2021-06-27 stsp test_done "$testroot" "$ret"
2647 a769b60b 2021-06-27 stsp blob_id=`(cd $testroot/wt && got info beta | grep 'blob:' | \
2648 a769b60b 2021-06-27 stsp cut -d ':' -f 2 | tr -d ' ')`
2649 2c41dce7 2021-06-27 stsp if [ "$blob_id" != "$blob_id0" ]; then
2650 2c41dce7 2021-06-27 stsp echo "file beta has the wrong base blob ID" >&2
2651 2c41dce7 2021-06-27 stsp test_done "$testroot" "1"
2655 2c41dce7 2021-06-27 stsp commit_id=`(cd $testroot/wt && got info beta | \
2656 2c41dce7 2021-06-27 stsp grep 'based on commit:' | cut -d ':' -f 2 | tr -d ' ')`
2657 2c41dce7 2021-06-27 stsp if [ "$commit_id" != "$commit_id0" ]; then
2658 2c41dce7 2021-06-27 stsp echo "file beta has the wrong base commit ID" >&2
2659 2c41dce7 2021-06-27 stsp test_done "$testroot" "1"
2663 2c41dce7 2021-06-27 stsp # remove the directory which obstructs file beta
2664 2c41dce7 2021-06-27 stsp rm -r $testroot/wt/beta
2666 2c41dce7 2021-06-27 stsp # updating to the latest commit should now update beta
2667 2c41dce7 2021-06-27 stsp (cd $testroot/wt && got update > $testroot/stdout)
2668 2c41dce7 2021-06-27 stsp echo "! beta" > $testroot/stdout.expected
2669 e6f4ba31 2021-09-24 thomas echo "~ new" >> $testroot/stdout.expected
2670 4f3c844b 2021-09-14 stsp echo "Updated to refs/heads/master: $commit_id1" \
2671 4f3c844b 2021-09-14 stsp >> $testroot/stdout.expected
2672 e6f4ba31 2021-09-24 thomas echo "File paths obstructed by a non-regular file: 1" \
2673 e6f4ba31 2021-09-24 thomas >> $testroot/stdout.expected
2674 2c41dce7 2021-06-27 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2676 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2677 2c41dce7 2021-06-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
2678 2c41dce7 2021-06-27 stsp test_done "$testroot" "$ret"
2682 2c41dce7 2021-06-27 stsp blob_id=`(cd $testroot/wt && got info beta | grep 'blob:' | \
2683 2c41dce7 2021-06-27 stsp cut -d ':' -f 2 | tr -d ' ')`
2684 a769b60b 2021-06-27 stsp if [ "$blob_id" != "$blob_id1" ]; then
2685 a769b60b 2021-06-27 stsp echo "file beta has the wrong base blob ID" >&2
2686 a769b60b 2021-06-27 stsp test_done "$testroot" "1"
2690 a769b60b 2021-06-27 stsp commit_id=`(cd $testroot/wt && got info beta | \
2691 a769b60b 2021-06-27 stsp grep 'based on commit:' | cut -d ':' -f 2 | tr -d ' ')`
2692 a769b60b 2021-06-27 stsp if [ "$commit_id" != "$commit_id1" ]; then
2693 a769b60b 2021-06-27 stsp echo "file beta has the wrong base commit ID: $commit_id" >&2
2694 a769b60b 2021-06-27 stsp test_done "$testroot" "1"
2698 a769b60b 2021-06-27 stsp echo "changed beta" > $testroot/content.expected
2699 a769b60b 2021-06-27 stsp cat $testroot/wt/beta > $testroot/content
2700 a769b60b 2021-06-27 stsp cmp -s $testroot/content.expected $testroot/content
2702 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2703 a769b60b 2021-06-27 stsp diff -u $testroot/content.expected $testroot/content
2705 a769b60b 2021-06-27 stsp test_done "$testroot" "$ret"
2708 67c65ed7 2021-09-14 tracey test_update_quiet() {
2709 67c65ed7 2021-09-14 tracey local testroot=`test_init update_quiet`
2711 67c65ed7 2021-09-14 tracey got checkout $testroot/repo $testroot/wt > /dev/null
2713 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2714 67c65ed7 2021-09-14 tracey test_done "$testroot" "$ret"
2715 67c65ed7 2021-09-14 tracey return 1
2718 67c65ed7 2021-09-14 tracey echo "modified alpha" > $testroot/repo/alpha
2719 67c65ed7 2021-09-14 tracey git_commit $testroot/repo -m "modified alpha"
2721 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
2722 67c65ed7 2021-09-14 tracey git_show_head $testroot/repo >> $testroot/stdout.expected
2723 67c65ed7 2021-09-14 tracey echo >> $testroot/stdout.expected
2725 67c65ed7 2021-09-14 tracey (cd $testroot/wt && got update -q > $testroot/stdout)
2727 67c65ed7 2021-09-14 tracey cmp -s $testroot/stdout.expected $testroot/stdout
2729 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2730 67c65ed7 2021-09-14 tracey diff -u $testroot/stdout.expected $testroot/stdout
2731 67c65ed7 2021-09-14 tracey test_done "$testroot" "$ret"
2732 67c65ed7 2021-09-14 tracey return 1
2735 67c65ed7 2021-09-14 tracey echo "modified alpha" > $testroot/content.expected
2736 67c65ed7 2021-09-14 tracey cat $testroot/wt/alpha > $testroot/content
2738 67c65ed7 2021-09-14 tracey cmp -s $testroot/content.expected $testroot/content
2740 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2741 67c65ed7 2021-09-14 tracey diff -u $testroot/content.expected $testroot/content
2743 67c65ed7 2021-09-14 tracey test_done "$testroot" "$ret"
2746 24f136e0 2021-11-20 thomas test_update_binary_file() {
2747 24f136e0 2021-11-20 thomas local testroot=`test_init update_binary_file`
2748 24f136e0 2021-11-20 thomas local commit_id0=`git_show_head $testroot/repo`
2750 24f136e0 2021-11-20 thomas got checkout $testroot/repo $testroot/wt > /dev/null
2752 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2753 24f136e0 2021-11-20 thomas test_done "$testroot" "$ret"
2754 24f136e0 2021-11-20 thomas return 1
2757 24f136e0 2021-11-20 thomas cp /bin/ls $testroot/wt/foo
2758 24f136e0 2021-11-20 thomas chmod 755 $testroot/wt/foo
2759 24f136e0 2021-11-20 thomas (cd $testroot/wt && got add foo >/dev/null)
2760 24f136e0 2021-11-20 thomas (cd $testroot/wt && got commit -m 'add binary file' > /dev/null)
2761 24f136e0 2021-11-20 thomas local commit_id1=`git_show_head $testroot/repo`
2763 24f136e0 2021-11-20 thomas cp /bin/cat $testroot/wt/foo
2764 24f136e0 2021-11-20 thomas chmod 755 $testroot/wt/foo
2765 24f136e0 2021-11-20 thomas (cd $testroot/wt && got commit -m 'change binary file' > /dev/null)
2766 24f136e0 2021-11-20 thomas local commit_id2=`git_show_head $testroot/repo`
2768 24f136e0 2021-11-20 thomas cp /bin/cp $testroot/wt/foo
2769 24f136e0 2021-11-20 thomas chmod 755 $testroot/wt/foo
2770 24f136e0 2021-11-20 thomas (cd $testroot/wt && got commit -m 'change binary file' > /dev/null)
2771 24f136e0 2021-11-20 thomas local commit_id3=`git_show_head $testroot/repo`
2773 24f136e0 2021-11-20 thomas (cd $testroot/wt && got rm foo >/dev/null)
2774 24f136e0 2021-11-20 thomas (cd $testroot/wt && got commit -m 'remove binary file' > /dev/null)
2775 24f136e0 2021-11-20 thomas local commit_id4=`git_show_head $testroot/repo`
2777 24f136e0 2021-11-20 thomas # backdate the work tree to make it usable for updating
2778 24f136e0 2021-11-20 thomas (cd $testroot/wt && got up -c $commit_id0 > /dev/null)
2780 24f136e0 2021-11-20 thomas # update which adds a binary file
2781 24f136e0 2021-11-20 thomas (cd $testroot/wt && got up -c $commit_id1 > $testroot/stdout)
2783 24f136e0 2021-11-20 thomas echo "A foo" > $testroot/stdout.expected
2784 24f136e0 2021-11-20 thomas echo -n "Updated to refs/heads/master: $commit_id1" \
2785 24f136e0 2021-11-20 thomas >> $testroot/stdout.expected
2786 24f136e0 2021-11-20 thomas echo >> $testroot/stdout.expected
2787 24f136e0 2021-11-20 thomas cmp -s $testroot/stdout.expected $testroot/stdout
2789 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2790 24f136e0 2021-11-20 thomas diff -u $testroot/stdout.expected $testroot/stdout
2791 24f136e0 2021-11-20 thomas test_done "$testroot" "$ret"
2792 24f136e0 2021-11-20 thomas return 1
2795 24f136e0 2021-11-20 thomas cp /bin/ls $testroot/content.expected
2796 24f136e0 2021-11-20 thomas chmod 755 $testroot/content.expected
2797 24f136e0 2021-11-20 thomas cat $testroot/wt/foo > $testroot/content
2799 24f136e0 2021-11-20 thomas cmp -s $testroot/content.expected $testroot/content
2801 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2802 24f136e0 2021-11-20 thomas diff -u $testroot/content.expected $testroot/content
2803 24f136e0 2021-11-20 thomas test_done "$testroot" "$ret"
2804 24f136e0 2021-11-20 thomas return 1
2807 24f136e0 2021-11-20 thomas # update which adds a conflicting binary file
2808 24f136e0 2021-11-20 thomas (cd $testroot/wt && got up -c $commit_id0 > /dev/null)
2809 24f136e0 2021-11-20 thomas cp /bin/cat $testroot/wt/foo
2810 24f136e0 2021-11-20 thomas chmod 755 $testroot/wt/foo
2811 24f136e0 2021-11-20 thomas (cd $testroot/wt && got add foo > /dev/null)
2812 24f136e0 2021-11-20 thomas (cd $testroot/wt && got up -c $commit_id1 > $testroot/stdout)
2814 24f136e0 2021-11-20 thomas echo "C foo" > $testroot/stdout.expected
2815 24f136e0 2021-11-20 thomas echo "Updated to refs/heads/master: $commit_id1" \
2816 24f136e0 2021-11-20 thomas >> $testroot/stdout.expected
2817 24f136e0 2021-11-20 thomas echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
2818 24f136e0 2021-11-20 thomas cmp -s $testroot/stdout.expected $testroot/stdout
2820 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2821 24f136e0 2021-11-20 thomas diff -u $testroot/stdout.expected $testroot/stdout
2822 24f136e0 2021-11-20 thomas test_done "$testroot" "$ret"
2823 24f136e0 2021-11-20 thomas return 1
2826 24f136e0 2021-11-20 thomas echo "Binary files differ and cannot be merged automatically:" \
2827 24f136e0 2021-11-20 thomas > $testroot/content.expected
2828 24f136e0 2021-11-20 thomas echo "<<<<<<< merged change: commit $commit_id1" \
2829 24f136e0 2021-11-20 thomas >> $testroot/content.expected
2830 24f136e0 2021-11-20 thomas echo -n "file " >> $testroot/content.expected
2831 24f136e0 2021-11-20 thomas ls $testroot/wt/foo-1-* >> $testroot/content.expected
2832 24f136e0 2021-11-20 thomas echo '=======' >> $testroot/content.expected
2833 24f136e0 2021-11-20 thomas echo -n "file " >> $testroot/content.expected
2834 24f136e0 2021-11-20 thomas ls $testroot/wt/foo-2-* >> $testroot/content.expected
2835 24f136e0 2021-11-20 thomas echo ">>>>>>>" >> $testroot/content.expected
2836 24f136e0 2021-11-20 thomas cat $testroot/wt/foo > $testroot/content
2838 24f136e0 2021-11-20 thomas cmp -s $testroot/content.expected $testroot/content
2840 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2841 24f136e0 2021-11-20 thomas diff -u $testroot/content.expected $testroot/content
2842 24f136e0 2021-11-20 thomas test_done "$testroot" "$ret"
2843 24f136e0 2021-11-20 thomas return 1
2846 24f136e0 2021-11-20 thomas cp /bin/ls $testroot/content.expected
2847 24f136e0 2021-11-20 thomas chmod 755 $testroot/content.expected
2848 24f136e0 2021-11-20 thomas cat $testroot/wt/foo-1-* > $testroot/content
2850 24f136e0 2021-11-20 thomas cmp -s $testroot/content.expected $testroot/content
2852 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2853 24f136e0 2021-11-20 thomas diff -u $testroot/content.expected $testroot/content
2854 24f136e0 2021-11-20 thomas test_done "$testroot" "$ret"
2855 24f136e0 2021-11-20 thomas return 1
2858 24f136e0 2021-11-20 thomas cp /bin/cat $testroot/content.expected
2859 24f136e0 2021-11-20 thomas chmod 755 $testroot/content.expected
2860 24f136e0 2021-11-20 thomas cat $testroot/wt/foo-2-* > $testroot/content
2862 24f136e0 2021-11-20 thomas cmp -s $testroot/content.expected $testroot/content
2864 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2865 24f136e0 2021-11-20 thomas diff -u $testroot/content.expected $testroot/content
2866 24f136e0 2021-11-20 thomas test_done "$testroot" "$ret"
2867 24f136e0 2021-11-20 thomas return 1
2870 24f136e0 2021-11-20 thomas # tidy up
2871 24f136e0 2021-11-20 thomas (cd $testroot/wt && got revert -R . >/dev/null)
2872 24f136e0 2021-11-20 thomas rm $testroot/wt/foo-1-* $testroot/wt/foo-2-*
2873 24f136e0 2021-11-20 thomas (cd $testroot/wt && got up -c $commit_id1 > /dev/null)
2875 24f136e0 2021-11-20 thomas # update which changes a binary file
2876 24f136e0 2021-11-20 thomas (cd $testroot/wt && got up -c $commit_id2 > $testroot/stdout)
2878 24f136e0 2021-11-20 thomas echo "U foo" > $testroot/stdout.expected
2879 24f136e0 2021-11-20 thomas echo -n "Updated to refs/heads/master: $commit_id2" \
2880 24f136e0 2021-11-20 thomas >> $testroot/stdout.expected
2881 24f136e0 2021-11-20 thomas echo >> $testroot/stdout.expected
2882 24f136e0 2021-11-20 thomas cmp -s $testroot/stdout.expected $testroot/stdout
2884 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2885 24f136e0 2021-11-20 thomas diff -u $testroot/stdout.expected $testroot/stdout
2886 24f136e0 2021-11-20 thomas test_done "$testroot" "$ret"
2887 24f136e0 2021-11-20 thomas return 1
2890 24f136e0 2021-11-20 thomas cp /bin/cat $testroot/content.expected
2891 24f136e0 2021-11-20 thomas chmod 755 $testroot/content.expected
2892 24f136e0 2021-11-20 thomas cat $testroot/wt/foo > $testroot/content
2894 24f136e0 2021-11-20 thomas cmp -s $testroot/content.expected $testroot/content
2896 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2897 24f136e0 2021-11-20 thomas diff -u $testroot/content.expected $testroot/content
2898 24f136e0 2021-11-20 thomas test_done "$testroot" "$ret"
2899 24f136e0 2021-11-20 thomas return 1
2902 24f136e0 2021-11-20 thomas # update which changes a locally modified binary file
2903 24f136e0 2021-11-20 thomas cp /bin/ls $testroot/wt/foo
2904 24f136e0 2021-11-20 thomas chmod 755 $testroot/wt/foo
2905 24f136e0 2021-11-20 thomas (cd $testroot/wt && got up -c $commit_id3 > $testroot/stdout)
2907 24f136e0 2021-11-20 thomas echo "C foo" > $testroot/stdout.expected
2908 24f136e0 2021-11-20 thomas echo -n "Updated to refs/heads/master: $commit_id3" \
2909 24f136e0 2021-11-20 thomas >> $testroot/stdout.expected
2910 24f136e0 2021-11-20 thomas echo >> $testroot/stdout.expected
2911 24f136e0 2021-11-20 thomas echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
2912 24f136e0 2021-11-20 thomas cmp -s $testroot/stdout.expected $testroot/stdout
2914 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2915 24f136e0 2021-11-20 thomas diff -u $testroot/stdout.expected $testroot/stdout
2916 24f136e0 2021-11-20 thomas test_done "$testroot" "$ret"
2917 24f136e0 2021-11-20 thomas return 1
2920 24f136e0 2021-11-20 thomas echo "Binary files differ and cannot be merged automatically:" \
2921 24f136e0 2021-11-20 thomas > $testroot/content.expected
2922 24f136e0 2021-11-20 thomas echo "<<<<<<< merged change: commit $commit_id3" \
2923 24f136e0 2021-11-20 thomas >> $testroot/content.expected
2924 24f136e0 2021-11-20 thomas echo -n "file " >> $testroot/content.expected
2925 24f136e0 2021-11-20 thomas ls $testroot/wt/foo-1-* >> $testroot/content.expected
2926 24f136e0 2021-11-20 thomas echo "||||||| 3-way merge base: commit $commit_id2" \
2927 24f136e0 2021-11-20 thomas >> $testroot/content.expected
2928 24f136e0 2021-11-20 thomas echo -n "file " >> $testroot/content.expected
2929 24f136e0 2021-11-20 thomas ls $testroot/wt/foo-orig-* >> $testroot/content.expected
2930 24f136e0 2021-11-20 thomas echo '=======' >> $testroot/content.expected
2931 24f136e0 2021-11-20 thomas echo -n "file " >> $testroot/content.expected
2932 24f136e0 2021-11-20 thomas ls $testroot/wt/foo-2-* >> $testroot/content.expected
2933 24f136e0 2021-11-20 thomas echo ">>>>>>>" >> $testroot/content.expected
2934 24f136e0 2021-11-20 thomas cat $testroot/wt/foo > $testroot/content
2936 24f136e0 2021-11-20 thomas cmp -s $testroot/content.expected $testroot/content
2938 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2939 24f136e0 2021-11-20 thomas diff -u $testroot/content.expected $testroot/content
2940 24f136e0 2021-11-20 thomas test_done "$testroot" "$ret"
2941 24f136e0 2021-11-20 thomas return 1
2944 24f136e0 2021-11-20 thomas cp /bin/cp $testroot/content.expected
2945 24f136e0 2021-11-20 thomas chmod 755 $testroot/content.expected
2946 24f136e0 2021-11-20 thomas cp $testroot/wt/foo-1-* $testroot/content
2947 24f136e0 2021-11-20 thomas cmp -s $testroot/content.expected $testroot/content
2949 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2950 24f136e0 2021-11-20 thomas diff -u $testroot/content.expected $testroot/content
2951 24f136e0 2021-11-20 thomas test_done "$testroot" "$ret"
2952 24f136e0 2021-11-20 thomas return 1
2955 24f136e0 2021-11-20 thomas cp /bin/ls $testroot/content.expected
2956 24f136e0 2021-11-20 thomas chmod 755 $testroot/content.expected
2957 24f136e0 2021-11-20 thomas cp $testroot/wt/foo-2-* $testroot/content
2958 24f136e0 2021-11-20 thomas cmp -s $testroot/content.expected $testroot/content
2960 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2961 24f136e0 2021-11-20 thomas diff -u $testroot/content.expected $testroot/content
2962 24f136e0 2021-11-20 thomas test_done "$testroot" "$ret"
2963 24f136e0 2021-11-20 thomas return 1
2966 24f136e0 2021-11-20 thomas (cd $testroot/wt && got status > $testroot/stdout)
2967 24f136e0 2021-11-20 thomas echo 'C foo' > $testroot/stdout.expected
2968 24f136e0 2021-11-20 thomas echo -n '? ' >> $testroot/stdout.expected
2969 24f136e0 2021-11-20 thomas (cd $testroot/wt && ls foo-1-* >> $testroot/stdout.expected)
2970 24f136e0 2021-11-20 thomas echo -n '? ' >> $testroot/stdout.expected
2971 24f136e0 2021-11-20 thomas (cd $testroot/wt && ls foo-2-* >> $testroot/stdout.expected)
2972 24f136e0 2021-11-20 thomas echo -n '? ' >> $testroot/stdout.expected
2973 24f136e0 2021-11-20 thomas (cd $testroot/wt && ls foo-orig-* >> $testroot/stdout.expected)
2974 24f136e0 2021-11-20 thomas cmp -s $testroot/stdout.expected $testroot/stdout
2976 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2977 24f136e0 2021-11-20 thomas diff -u $testroot/stdout.expected $testroot/stdout
2978 24f136e0 2021-11-20 thomas test_done "$testroot" "$ret"
2979 24f136e0 2021-11-20 thomas return 1
2982 24f136e0 2021-11-20 thomas # tidy up
2983 24f136e0 2021-11-20 thomas (cd $testroot/wt && got revert -R . > /dev/null)
2984 24f136e0 2021-11-20 thomas rm $testroot/wt/foo-orig-* $testroot/wt/foo-1-* $testroot/wt/foo-2-*
2986 24f136e0 2021-11-20 thomas # update which deletes a binary file
2987 24f136e0 2021-11-20 thomas (cd $testroot/wt && got up -c $commit_id4 > $testroot/stdout)
2988 24f136e0 2021-11-20 thomas echo "D foo" > $testroot/stdout.expected
2989 24f136e0 2021-11-20 thomas echo -n "Updated to refs/heads/master: $commit_id4" \
2990 24f136e0 2021-11-20 thomas >> $testroot/stdout.expected
2991 24f136e0 2021-11-20 thomas echo >> $testroot/stdout.expected
2992 24f136e0 2021-11-20 thomas cmp -s $testroot/stdout.expected $testroot/stdout
2994 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2995 24f136e0 2021-11-20 thomas diff -u $testroot/stdout.expected $testroot/stdout
2996 24f136e0 2021-11-20 thomas test_done "$testroot" "$ret"
2999 24f136e0 2021-11-20 thomas if [ -e $testroot/wt/foo ]; then
3000 24f136e0 2021-11-20 thomas echo "removed file foo still exists on disk" >&2
3001 24f136e0 2021-11-20 thomas test_done "$testroot" "1"
3002 24f136e0 2021-11-20 thomas return 1
3004 24f136e0 2021-11-20 thomas test_done "$testroot" "0"
3007 7fb414ae 2020-08-08 stsp test_parseargs "$@"
3008 c84d8c75 2019-01-02 stsp run_test test_update_basic
3009 3b4d3732 2019-01-02 stsp run_test test_update_adds_file
3010 512f0d0e 2019-01-02 stsp run_test test_update_deletes_file
3011 f5c49f82 2019-01-06 stsp run_test test_update_deletes_dir
3012 5cc266ba 2019-01-06 stsp run_test test_update_deletes_dir_with_path_prefix
3013 90285c3b 2019-01-08 stsp run_test test_update_deletes_dir_recursively
3014 4482e97b 2019-01-08 stsp run_test test_update_sibling_dirs_with_common_prefix
3015 50952927 2019-01-12 stsp run_test test_update_dir_with_dot_sibling
3016 46cee7a3 2019-01-12 stsp run_test test_update_moves_files_upwards
3017 bd4792ec 2019-01-13 stsp run_test test_update_moves_files_to_new_dir
3018 4a1ddfc2 2019-01-12 stsp run_test test_update_creates_missing_parent
3019 bd4792ec 2019-01-13 stsp run_test test_update_creates_missing_parent_with_subdir
3020 21908da4 2019-01-13 stsp run_test test_update_file_in_subsubdir
3021 6353ad76 2019-02-08 stsp run_test test_update_merges_file_edits
3022 68ed9ba5 2019-02-10 stsp run_test test_update_keeps_xbit
3023 ba8a0d4d 2019-02-10 stsp run_test test_update_clears_xbit
3024 a378724f 2019-02-10 stsp run_test test_update_restores_missing_file
3025 085d5bcf 2019-03-27 stsp run_test test_update_conflict_wt_add_vs_repo_add
3026 085d5bcf 2019-03-27 stsp run_test test_update_conflict_wt_edit_vs_repo_rm
3027 13d9040b 2019-03-27 stsp run_test test_update_conflict_wt_rm_vs_repo_edit
3028 66b11bf5 2019-03-27 stsp run_test test_update_conflict_wt_rm_vs_repo_rm
3029 c4cdcb68 2019-04-03 stsp run_test test_update_partial
3030 c4cdcb68 2019-04-03 stsp run_test test_update_partial_add
3031 c4cdcb68 2019-04-03 stsp run_test test_update_partial_rm
3032 c4cdcb68 2019-04-03 stsp run_test test_update_partial_dir
3033 d5bea539 2019-05-13 stsp run_test test_update_moved_branch_ref
3034 024e9686 2019-05-14 stsp run_test test_update_to_another_branch
3035 a367ff0f 2019-05-14 stsp run_test test_update_to_commit_on_wrong_branch
3036 c932eeeb 2019-05-22 stsp run_test test_update_bumps_base_commit_id
3037 303e2782 2019-08-09 stsp run_test test_update_tag
3038 523b8417 2019-10-19 stsp run_test test_update_toggles_xbit
3039 5036ab18 2020-04-18 stsp run_test test_update_preserves_conflicted_file
3040 e7303626 2020-05-14 stsp run_test test_update_modified_submodules
3041 e7303626 2020-05-14 stsp run_test test_update_adds_submodule
3042 e7303626 2020-05-14 stsp run_test test_update_conflict_wt_file_vs_repo_submodule
3043 f35fa46a 2020-07-23 stsp run_test test_update_adds_symlink
3044 993e2a1b 2020-07-23 stsp run_test test_update_deletes_symlink
3045 993e2a1b 2020-07-23 stsp run_test test_update_symlink_conflicts
3046 194cb7cb 2021-01-19 stsp run_test test_update_single_file
3047 a769b60b 2021-06-27 stsp run_test test_update_file_skipped_due_to_conflict
3048 2c41dce7 2021-06-27 stsp run_test test_update_file_skipped_due_to_obstruction
3049 67c65ed7 2021-09-14 tracey run_test test_update_quiet
3050 24f136e0 2021-11-20 thomas run_test test_update_binary_file
