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 c84d8c75 2019-01-02 stsp function 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 e60e7f5b 2019-02-10 stsp if [ "$ret" != "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 9c4b8182 2019-01-02 stsp echo -n "Updated to commit " >> $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 e60e7f5b 2019-02-10 stsp if [ "$ret" != "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 693719bc 2019-01-03 stsp if [ "$ret" != "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 3b4d3732 2019-01-02 stsp function 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 e60e7f5b 2019-02-10 stsp if [ "$ret" != "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 3b4d3732 2019-01-02 stsp echo -n "Updated to commit " >> $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 e60e7f5b 2019-02-10 stsp if [ "$ret" != "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 693719bc 2019-01-03 stsp if [ "$ret" != "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 512f0d0e 2019-01-02 stsp function test_update_deletes_file {
99 512f0d0e 2019-01-02 stsp local testroot=`test_init update_deletes_file`
101 512f0d0e 2019-01-02 stsp got checkout $testroot/repo $testroot/wt > /dev/null
103 e60e7f5b 2019-02-10 stsp if [ "$ret" != "0" ]; then
104 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
108 512f0d0e 2019-01-02 stsp (cd $testroot/repo && git_rm $testroot/repo beta)
109 512f0d0e 2019-01-02 stsp git_commit $testroot/repo -m "deleting a file"
111 512f0d0e 2019-01-02 stsp echo "D beta" > $testroot/stdout.expected
112 512f0d0e 2019-01-02 stsp echo -n "Updated to commit " >> $testroot/stdout.expected
113 512f0d0e 2019-01-02 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
114 512f0d0e 2019-01-02 stsp echo >> $testroot/stdout.expected
116 512f0d0e 2019-01-02 stsp (cd $testroot/wt && got update > $testroot/stdout)
118 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
120 e60e7f5b 2019-02-10 stsp if [ "$ret" != "0" ]; then
121 512f0d0e 2019-01-02 stsp diff -u $testroot/stdout.expected $testroot/stdout
122 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
126 512f0d0e 2019-01-02 stsp if [ -e $testroot/wt/beta ]; then
127 512f0d0e 2019-01-02 stsp echo "removed file beta still exists on disk" >&2
128 52a3df9b 2019-01-06 stsp test_done "$testroot" "1"
132 52a3df9b 2019-01-06 stsp test_done "$testroot" "0"
135 f5c49f82 2019-01-06 stsp function test_update_deletes_dir {
136 f5c49f82 2019-01-06 stsp local testroot=`test_init update_deletes_dir`
138 f5c49f82 2019-01-06 stsp got checkout $testroot/repo $testroot/wt > /dev/null
140 e60e7f5b 2019-02-10 stsp if [ "$ret" != "0" ]; then
141 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
145 f5c49f82 2019-01-06 stsp (cd $testroot/repo && git_rm $testroot/repo -r epsilon)
146 f5c49f82 2019-01-06 stsp git_commit $testroot/repo -m "deleting a directory"
148 f5c49f82 2019-01-06 stsp echo "D epsilon/zeta" > $testroot/stdout.expected
149 f5c49f82 2019-01-06 stsp echo -n "Updated to commit " >> $testroot/stdout.expected
150 f5c49f82 2019-01-06 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
151 f5c49f82 2019-01-06 stsp echo >> $testroot/stdout.expected
153 f5c49f82 2019-01-06 stsp (cd $testroot/wt && got update > $testroot/stdout)
155 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
157 e60e7f5b 2019-02-10 stsp if [ "$ret" != "0" ]; then
158 f5c49f82 2019-01-06 stsp diff -u $testroot/stdout.expected $testroot/stdout
159 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
163 f5c49f82 2019-01-06 stsp if [ -e $testroot/wt/epsilon ]; then
164 f5c49f82 2019-01-06 stsp echo "removed dir epsilon still exists on disk" >&2
165 52a3df9b 2019-01-06 stsp test_done "$testroot" "1"
169 52a3df9b 2019-01-06 stsp test_done "$testroot" "0"
172 5cc266ba 2019-01-06 stsp function test_update_deletes_dir_with_path_prefix {
173 5cc266ba 2019-01-06 stsp local testroot=`test_init update_deletes_dir_with_path_prefix`
174 5cc266ba 2019-01-06 stsp local first_rev=`git_show_head $testroot/repo`
176 5cc266ba 2019-01-06 stsp mkdir $testroot/repo/epsilon/psi
177 5cc266ba 2019-01-06 stsp echo mu > $testroot/repo/epsilon/psi/mu
178 5cc266ba 2019-01-06 stsp (cd $testroot/repo && git add .)
179 5cc266ba 2019-01-06 stsp git_commit $testroot/repo -m "adding a sub-directory beneath epsilon"
181 5cc266ba 2019-01-06 stsp # check out the epsilon/ sub-tree
182 5cc266ba 2019-01-06 stsp got checkout -p epsilon $testroot/repo $testroot/wt > /dev/null
184 e60e7f5b 2019-02-10 stsp if [ "$ret" != "0" ]; then
185 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
189 5cc266ba 2019-01-06 stsp # update back to first commit and expect psi/mu to be deleted
190 5cc266ba 2019-01-06 stsp echo "D psi/mu" > $testroot/stdout.expected
191 5cc266ba 2019-01-06 stsp echo "Updated to commit $first_rev" >> $testroot/stdout.expected
193 5cc266ba 2019-01-06 stsp (cd $testroot/wt && got update -c $first_rev > $testroot/stdout)
195 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
197 e60e7f5b 2019-02-10 stsp if [ "$ret" != "0" ]; then
198 5cc266ba 2019-01-06 stsp diff -u $testroot/stdout.expected $testroot/stdout
199 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
203 5cc266ba 2019-01-06 stsp if [ -e $testroot/wt/psi ]; then
204 5cc266ba 2019-01-06 stsp echo "removed dir psi still exists on disk" >&2
205 5cc266ba 2019-01-06 stsp test_done "$testroot" "1"
209 52a3df9b 2019-01-06 stsp test_done "$testroot" "0"
212 90285c3b 2019-01-08 stsp function test_update_deletes_dir_recursively {
213 90285c3b 2019-01-08 stsp local testroot=`test_init update_deletes_dir_recursively`
214 90285c3b 2019-01-08 stsp local first_rev=`git_show_head $testroot/repo`
216 90285c3b 2019-01-08 stsp mkdir $testroot/repo/epsilon/psi
217 90285c3b 2019-01-08 stsp echo mu > $testroot/repo/epsilon/psi/mu
218 90285c3b 2019-01-08 stsp mkdir $testroot/repo/epsilon/psi/chi
219 90285c3b 2019-01-08 stsp echo tau > $testroot/repo/epsilon/psi/chi/tau
220 90285c3b 2019-01-08 stsp (cd $testroot/repo && git add .)
221 90285c3b 2019-01-08 stsp git_commit $testroot/repo -m "adding a sub-directory beneath epsilon"
223 90285c3b 2019-01-08 stsp # check out the epsilon/ sub-tree
224 90285c3b 2019-01-08 stsp got checkout -p epsilon $testroot/repo $testroot/wt > /dev/null
226 e60e7f5b 2019-02-10 stsp if [ "$ret" != "0" ]; then
227 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
231 90285c3b 2019-01-08 stsp # update back to first commit and expect psi/mu to be deleted
232 90285c3b 2019-01-08 stsp echo "D psi/chi/tau" > $testroot/stdout.expected
233 90285c3b 2019-01-08 stsp echo "D psi/mu" >> $testroot/stdout.expected
234 90285c3b 2019-01-08 stsp echo "Updated to commit $first_rev" >> $testroot/stdout.expected
236 90285c3b 2019-01-08 stsp (cd $testroot/wt && got update -c $first_rev > $testroot/stdout)
238 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
240 90285c3b 2019-01-08 stsp if [ "$?" != "0" ]; then
241 90285c3b 2019-01-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
242 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
246 90285c3b 2019-01-08 stsp if [ -e $testroot/wt/psi ]; then
247 90285c3b 2019-01-08 stsp echo "removed dir psi still exists on disk" >&2
248 90285c3b 2019-01-08 stsp test_done "$testroot" "1"
252 90285c3b 2019-01-08 stsp test_done "$testroot" "0"
255 4482e97b 2019-01-08 stsp function test_update_sibling_dirs_with_common_prefix {
256 4482e97b 2019-01-08 stsp local testroot=`test_init update_sibling_dirs_with_common_prefix`
258 81a30460 2019-01-08 stsp got checkout $testroot/repo $testroot/wt > /dev/null
260 e60e7f5b 2019-02-10 stsp if [ "$ret" != "0" ]; then
261 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
265 81a30460 2019-01-08 stsp mkdir $testroot/repo/epsilon2
266 81a30460 2019-01-08 stsp echo mu > $testroot/repo/epsilon2/mu
267 81a30460 2019-01-08 stsp (cd $testroot/repo && git add epsilon2/mu)
268 81a30460 2019-01-08 stsp git_commit $testroot/repo -m "adding sibling of epsilon"
269 81a30460 2019-01-08 stsp echo change > $testroot/repo/epsilon/zeta
270 81a30460 2019-01-08 stsp git_commit $testroot/repo -m "changing epsilon/zeta"
272 81a30460 2019-01-08 stsp echo "U epsilon/zeta" > $testroot/stdout.expected
273 81a30460 2019-01-08 stsp echo "A epsilon2/mu" >> $testroot/stdout.expected
274 81a30460 2019-01-08 stsp echo -n "Updated to commit " >> $testroot/stdout.expected
275 81a30460 2019-01-08 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
276 81a30460 2019-01-08 stsp echo >> $testroot/stdout.expected
278 81a30460 2019-01-08 stsp (cd $testroot/wt && got update > $testroot/stdout)
280 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
282 e60e7f5b 2019-02-10 stsp if [ "$ret" != "0" ]; then
283 81a30460 2019-01-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
284 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
288 81a30460 2019-01-08 stsp echo "another change" > $testroot/repo/epsilon/zeta
289 81a30460 2019-01-08 stsp git_commit $testroot/repo -m "changing epsilon/zeta again"
291 81a30460 2019-01-08 stsp echo "U epsilon/zeta" > $testroot/stdout.expected
292 81a30460 2019-01-08 stsp echo -n "Updated to commit " >> $testroot/stdout.expected
293 81a30460 2019-01-08 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
294 81a30460 2019-01-08 stsp echo >> $testroot/stdout.expected
296 81a30460 2019-01-08 stsp # Bug: This update used to do delete/add epsilon2/mu again:
297 81a30460 2019-01-08 stsp # U epsilon/zeta
298 81a30460 2019-01-08 stsp # D epsilon2/mu <--- not intended
299 81a30460 2019-01-08 stsp # A epsilon2/mu <--- not intended
300 50952927 2019-01-12 stsp (cd $testroot/wt && got update > $testroot/stdout)
302 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
304 e60e7f5b 2019-02-10 stsp if [ "$ret" != "0" ]; then
305 50952927 2019-01-12 stsp diff -u $testroot/stdout.expected $testroot/stdout
306 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
310 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
312 e60e7f5b 2019-02-10 stsp if [ "$ret" != "0" ]; then
313 50952927 2019-01-12 stsp diff -u $testroot/stdout.expected $testroot/stdout
315 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
318 50952927 2019-01-12 stsp function test_update_dir_with_dot_sibling {
319 50952927 2019-01-12 stsp local testroot=`test_init update_dir_with_dot_sibling`
321 50952927 2019-01-12 stsp got checkout $testroot/repo $testroot/wt > /dev/null
323 e60e7f5b 2019-02-10 stsp if [ "$ret" != "0" ]; then
324 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
328 50952927 2019-01-12 stsp echo text > $testroot/repo/epsilon.txt
329 50952927 2019-01-12 stsp (cd $testroot/repo && git add epsilon.txt)
330 50952927 2019-01-12 stsp git_commit $testroot/repo -m "adding sibling of epsilon"
331 50952927 2019-01-12 stsp echo change > $testroot/repo/epsilon/zeta
332 50952927 2019-01-12 stsp git_commit $testroot/repo -m "changing epsilon/zeta"
334 f5d3d7af 2019-02-05 stsp echo "U epsilon/zeta" > $testroot/stdout.expected
335 f5d3d7af 2019-02-05 stsp echo "A epsilon.txt" >> $testroot/stdout.expected
336 50952927 2019-01-12 stsp echo -n "Updated to commit " >> $testroot/stdout.expected
337 50952927 2019-01-12 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
338 50952927 2019-01-12 stsp echo >> $testroot/stdout.expected
340 81a30460 2019-01-08 stsp (cd $testroot/wt && got update > $testroot/stdout)
342 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
344 e60e7f5b 2019-02-10 stsp if [ "$ret" != "0" ]; then
345 81a30460 2019-01-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
346 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
350 50952927 2019-01-12 stsp echo "another change" > $testroot/repo/epsilon/zeta
351 50952927 2019-01-12 stsp git_commit $testroot/repo -m "changing epsilon/zeta again"
353 50952927 2019-01-12 stsp echo "U epsilon/zeta" > $testroot/stdout.expected
354 50952927 2019-01-12 stsp echo -n "Updated to commit " >> $testroot/stdout.expected
355 50952927 2019-01-12 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
356 50952927 2019-01-12 stsp echo >> $testroot/stdout.expected
358 50952927 2019-01-12 stsp (cd $testroot/wt && got update > $testroot/stdout)
360 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
362 e60e7f5b 2019-02-10 stsp if [ "$ret" != "0" ]; then
363 81a30460 2019-01-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
364 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
368 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
370 e60e7f5b 2019-02-10 stsp if [ "$ret" != "0" ]; then
371 50952927 2019-01-12 stsp diff -u $testroot/stdout.expected $testroot/stdout
373 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
376 46cee7a3 2019-01-12 stsp function test_update_moves_files_upwards {
377 46cee7a3 2019-01-12 stsp local testroot=`test_init update_moves_files_upwards`
379 46cee7a3 2019-01-12 stsp mkdir $testroot/repo/epsilon/psi
380 46cee7a3 2019-01-12 stsp echo mu > $testroot/repo/epsilon/psi/mu
381 46cee7a3 2019-01-12 stsp mkdir $testroot/repo/epsilon/psi/chi
382 46cee7a3 2019-01-12 stsp echo tau > $testroot/repo/epsilon/psi/chi/tau
383 46cee7a3 2019-01-12 stsp (cd $testroot/repo && git add .)
384 46cee7a3 2019-01-12 stsp git_commit $testroot/repo -m "adding a sub-directory beneath epsilon"
386 46cee7a3 2019-01-12 stsp got checkout $testroot/repo $testroot/wt > /dev/null
388 e60e7f5b 2019-02-10 stsp if [ "$ret" != "0" ]; then
389 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
393 46cee7a3 2019-01-12 stsp (cd $testroot/repo && git mv epsilon/psi/mu epsilon/mu)
394 46cee7a3 2019-01-12 stsp (cd $testroot/repo && git mv epsilon/psi/chi/tau epsilon/psi/tau)
395 46cee7a3 2019-01-12 stsp git_commit $testroot/repo -m "moving files upwards"
397 21908da4 2019-01-13 stsp echo "A epsilon/mu" > $testroot/stdout.expected
398 21908da4 2019-01-13 stsp echo "D epsilon/psi/chi/tau" >> $testroot/stdout.expected
399 46cee7a3 2019-01-12 stsp echo "D epsilon/psi/mu" >> $testroot/stdout.expected
400 bd4792ec 2019-01-13 stsp echo "A epsilon/psi/tau" >> $testroot/stdout.expected
401 46cee7a3 2019-01-12 stsp echo -n "Updated to commit " >> $testroot/stdout.expected
402 46cee7a3 2019-01-12 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
403 46cee7a3 2019-01-12 stsp echo >> $testroot/stdout.expected
405 46cee7a3 2019-01-12 stsp (cd $testroot/wt && got update > $testroot/stdout)
407 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
409 e60e7f5b 2019-02-10 stsp if [ "$ret" != "0" ]; then
410 46cee7a3 2019-01-12 stsp diff -u $testroot/stdout.expected $testroot/stdout
411 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
415 46cee7a3 2019-01-12 stsp if [ -e $testroot/wt/epsilon/psi/chi ]; then
416 46cee7a3 2019-01-12 stsp echo "removed dir epsilon/psi/chi still exists on disk" >&2
417 46cee7a3 2019-01-12 stsp test_done "$testroot" "1"
421 46cee7a3 2019-01-12 stsp if [ -e $testroot/wt/epsilon/psi/mu ]; then
422 46cee7a3 2019-01-12 stsp echo "removed file epsilon/psi/mu still exists on disk" >&2
423 46cee7a3 2019-01-12 stsp test_done "$testroot" "1"
427 46cee7a3 2019-01-12 stsp test_done "$testroot" "0"
430 46cee7a3 2019-01-12 stsp function test_update_moves_files_to_new_dir {
431 46cee7a3 2019-01-12 stsp local testroot=`test_init update_moves_files_to_new_dir`
433 46cee7a3 2019-01-12 stsp mkdir $testroot/repo/epsilon/psi
434 46cee7a3 2019-01-12 stsp echo mu > $testroot/repo/epsilon/psi/mu
435 46cee7a3 2019-01-12 stsp mkdir $testroot/repo/epsilon/psi/chi
436 46cee7a3 2019-01-12 stsp echo tau > $testroot/repo/epsilon/psi/chi/tau
437 46cee7a3 2019-01-12 stsp (cd $testroot/repo && git add .)
438 46cee7a3 2019-01-12 stsp git_commit $testroot/repo -m "adding a sub-directory beneath epsilon"
440 46cee7a3 2019-01-12 stsp got checkout $testroot/repo $testroot/wt > /dev/null
442 e60e7f5b 2019-02-10 stsp if [ "$ret" != "0" ]; then
443 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
447 46cee7a3 2019-01-12 stsp mkdir -p $testroot/repo/epsilon-new/psi
448 46cee7a3 2019-01-12 stsp (cd $testroot/repo && git mv epsilon/psi/mu epsilon-new/mu)
449 46cee7a3 2019-01-12 stsp (cd $testroot/repo && git mv epsilon/psi/chi/tau epsilon-new/psi/tau)
450 46cee7a3 2019-01-12 stsp git_commit $testroot/repo -m "moving files upwards"
452 f5d3d7af 2019-02-05 stsp echo "D epsilon/psi/chi/tau" > $testroot/stdout.expected
453 46cee7a3 2019-01-12 stsp echo "D epsilon/psi/mu" >> $testroot/stdout.expected
454 f5d3d7af 2019-02-05 stsp echo "A epsilon-new/mu" >> $testroot/stdout.expected
455 f5d3d7af 2019-02-05 stsp echo "A epsilon-new/psi/tau" >> $testroot/stdout.expected
456 46cee7a3 2019-01-12 stsp echo -n "Updated to commit " >> $testroot/stdout.expected
457 46cee7a3 2019-01-12 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
458 46cee7a3 2019-01-12 stsp echo >> $testroot/stdout.expected
460 46cee7a3 2019-01-12 stsp (cd $testroot/wt && got update > $testroot/stdout)
462 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
464 e60e7f5b 2019-02-10 stsp if [ "$ret" != "0" ]; then
465 46cee7a3 2019-01-12 stsp diff -u $testroot/stdout.expected $testroot/stdout
466 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
470 46cee7a3 2019-01-12 stsp if [ -e $testroot/wt/epsilon/psi/chi ]; then
471 46cee7a3 2019-01-12 stsp echo "removed dir epsilon/psi/chi still exists on disk" >&2
472 46cee7a3 2019-01-12 stsp test_done "$testroot" "1"
476 46cee7a3 2019-01-12 stsp if [ -e $testroot/wt/epsilon/psi/mu ]; then
477 46cee7a3 2019-01-12 stsp echo "removed file epsilon/psi/mu still exists on disk" >&2
478 46cee7a3 2019-01-12 stsp test_done "$testroot" "1"
482 4a1ddfc2 2019-01-12 stsp test_done "$testroot" "0"
485 4a1ddfc2 2019-01-12 stsp function test_update_creates_missing_parent {
486 1aad446a 2019-01-13 stsp local testroot=`test_init update_creates_missing_parent 1`
488 4a1ddfc2 2019-01-12 stsp touch $testroot/repo/Makefile
489 4a1ddfc2 2019-01-12 stsp touch $testroot/repo/snake.6
490 4a1ddfc2 2019-01-12 stsp touch $testroot/repo/snake.c
491 4a1ddfc2 2019-01-12 stsp (cd $testroot/repo && git add .)
492 4a1ddfc2 2019-01-12 stsp git_commit $testroot/repo -m "adding initial snake tree"
494 4a1ddfc2 2019-01-12 stsp got checkout $testroot/repo $testroot/wt > /dev/null
496 e60e7f5b 2019-02-10 stsp if [ "$ret" != "0" ]; then
497 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
501 4a1ddfc2 2019-01-12 stsp mkdir -p $testroot/repo/snake
502 4a1ddfc2 2019-01-12 stsp (cd $testroot/repo && git mv Makefile snake.6 snake.c snake)
503 4a1ddfc2 2019-01-12 stsp touch $testroot/repo/snake/move.c
504 4a1ddfc2 2019-01-12 stsp touch $testroot/repo/snake/pathnames.h
505 4a1ddfc2 2019-01-12 stsp touch $testroot/repo/snake/snake.h
506 4a1ddfc2 2019-01-12 stsp mkdir -p $testroot/repo/snscore
507 4a1ddfc2 2019-01-12 stsp touch $testroot/repo/snscore/Makefile
508 4a1ddfc2 2019-01-12 stsp touch $testroot/repo/snscore/snscore.c
509 4a1ddfc2 2019-01-12 stsp (cd $testroot/repo && git add .)
510 4a1ddfc2 2019-01-12 stsp git_commit $testroot/repo -m "restructuring snake tree"
512 4a1ddfc2 2019-01-12 stsp echo "D Makefile" > $testroot/stdout.expected
513 4a1ddfc2 2019-01-12 stsp echo "A snake/Makefile" >> $testroot/stdout.expected
514 4a1ddfc2 2019-01-12 stsp echo "A snake/move.c" >> $testroot/stdout.expected
515 4a1ddfc2 2019-01-12 stsp echo "A snake/pathnames.h" >> $testroot/stdout.expected
516 4a1ddfc2 2019-01-12 stsp echo "A snake/snake.6" >> $testroot/stdout.expected
517 4a1ddfc2 2019-01-12 stsp echo "A snake/snake.c" >> $testroot/stdout.expected
518 4a1ddfc2 2019-01-12 stsp echo "A snake/snake.h" >> $testroot/stdout.expected
519 18831e78 2019-02-10 stsp echo "D snake.6" >> $testroot/stdout.expected
520 18831e78 2019-02-10 stsp echo "D snake.c" >> $testroot/stdout.expected
521 bd4792ec 2019-01-13 stsp echo "A snscore/Makefile" >> $testroot/stdout.expected
522 bd4792ec 2019-01-13 stsp echo "A snscore/snscore.c" >> $testroot/stdout.expected
523 bd4792ec 2019-01-13 stsp echo -n "Updated to commit " >> $testroot/stdout.expected
524 bd4792ec 2019-01-13 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
525 bd4792ec 2019-01-13 stsp echo >> $testroot/stdout.expected
527 bd4792ec 2019-01-13 stsp (cd $testroot/wt && got update > $testroot/stdout)
529 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
531 e60e7f5b 2019-02-10 stsp if [ "$ret" != "0" ]; then
532 e60e7f5b 2019-02-10 stsp diff -u $testroot/stdout.expected $testroot/stdout
534 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
537 bd4792ec 2019-01-13 stsp function test_update_creates_missing_parent_with_subdir {
538 1aad446a 2019-01-13 stsp local testroot=`test_init update_creates_missing_parent_with_subdir 1`
540 bd4792ec 2019-01-13 stsp touch $testroot/repo/Makefile
541 bd4792ec 2019-01-13 stsp touch $testroot/repo/snake.6
542 bd4792ec 2019-01-13 stsp touch $testroot/repo/snake.c
543 bd4792ec 2019-01-13 stsp (cd $testroot/repo && git add .)
544 bd4792ec 2019-01-13 stsp git_commit $testroot/repo -m "adding initial snake tree"
546 bd4792ec 2019-01-13 stsp got checkout $testroot/repo $testroot/wt > /dev/null
548 e60e7f5b 2019-02-10 stsp if [ "$ret" != "0" ]; then
549 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
553 bd4792ec 2019-01-13 stsp mkdir -p $testroot/repo/sss/snake
554 bd4792ec 2019-01-13 stsp (cd $testroot/repo && git mv Makefile snake.6 snake.c sss/snake)
555 bd4792ec 2019-01-13 stsp touch $testroot/repo/sss/snake/move.c
556 bd4792ec 2019-01-13 stsp touch $testroot/repo/sss/snake/pathnames.h
557 bd4792ec 2019-01-13 stsp touch $testroot/repo/sss/snake/snake.h
558 bd4792ec 2019-01-13 stsp mkdir -p $testroot/repo/snscore
559 bd4792ec 2019-01-13 stsp touch $testroot/repo/snscore/Makefile
560 bd4792ec 2019-01-13 stsp touch $testroot/repo/snscore/snscore.c
561 bd4792ec 2019-01-13 stsp (cd $testroot/repo && git add .)
562 bd4792ec 2019-01-13 stsp git_commit $testroot/repo -m "restructuring snake tree"
564 bd4792ec 2019-01-13 stsp echo "D Makefile" > $testroot/stdout.expected
565 4a1ddfc2 2019-01-12 stsp echo "D snake.6" >> $testroot/stdout.expected
566 4a1ddfc2 2019-01-12 stsp echo "D snake.c" >> $testroot/stdout.expected
567 4a1ddfc2 2019-01-12 stsp echo "A snscore/Makefile" >> $testroot/stdout.expected
568 4a1ddfc2 2019-01-12 stsp echo "A snscore/snscore.c" >> $testroot/stdout.expected
569 bd4792ec 2019-01-13 stsp echo "A sss/snake/Makefile" >> $testroot/stdout.expected
570 bd4792ec 2019-01-13 stsp echo "A sss/snake/move.c" >> $testroot/stdout.expected
571 bd4792ec 2019-01-13 stsp echo "A sss/snake/pathnames.h" >> $testroot/stdout.expected
572 bd4792ec 2019-01-13 stsp echo "A sss/snake/snake.6" >> $testroot/stdout.expected
573 bd4792ec 2019-01-13 stsp echo "A sss/snake/snake.c" >> $testroot/stdout.expected
574 bd4792ec 2019-01-13 stsp echo "A sss/snake/snake.h" >> $testroot/stdout.expected
575 4a1ddfc2 2019-01-12 stsp echo -n "Updated to commit " >> $testroot/stdout.expected
576 4a1ddfc2 2019-01-12 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
577 4a1ddfc2 2019-01-12 stsp echo >> $testroot/stdout.expected
579 4a1ddfc2 2019-01-12 stsp (cd $testroot/wt && got update > $testroot/stdout)
581 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
583 e60e7f5b 2019-02-10 stsp if [ "$ret" != "0" ]; then
584 4a1ddfc2 2019-01-12 stsp diff -u $testroot/stdout.expected $testroot/stdout
585 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
589 46cee7a3 2019-01-12 stsp test_done "$testroot" "0"
592 21908da4 2019-01-13 stsp function test_update_file_in_subsubdir {
593 1aad446a 2019-01-13 stsp local testroot=`test_init update_fle_in_subsubdir 1`
595 21908da4 2019-01-13 stsp touch $testroot/repo/Makefile
596 21908da4 2019-01-13 stsp mkdir -p $testroot/repo/altq
597 21908da4 2019-01-13 stsp touch $testroot/repo/altq/if_altq.h
598 21908da4 2019-01-13 stsp mkdir -p $testroot/repo/arch/alpha
599 21908da4 2019-01-13 stsp touch $testroot/repo/arch/alpha/Makefile
600 21908da4 2019-01-13 stsp (cd $testroot/repo && git add .)
601 21908da4 2019-01-13 stsp git_commit $testroot/repo -m "adding initial tree"
603 21908da4 2019-01-13 stsp got checkout $testroot/repo $testroot/wt > /dev/null
605 e60e7f5b 2019-02-10 stsp if [ "$ret" != "0" ]; then
606 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
610 21908da4 2019-01-13 stsp echo change > $testroot/repo/arch/alpha/Makefile
611 21908da4 2019-01-13 stsp (cd $testroot/repo && git add .)
612 21908da4 2019-01-13 stsp git_commit $testroot/repo -m "changed a file"
614 21908da4 2019-01-13 stsp echo "U arch/alpha/Makefile" > $testroot/stdout.expected
615 21908da4 2019-01-13 stsp echo -n "Updated to commit " >> $testroot/stdout.expected
616 21908da4 2019-01-13 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
617 21908da4 2019-01-13 stsp echo >> $testroot/stdout.expected
619 21908da4 2019-01-13 stsp (cd $testroot/wt && got update > $testroot/stdout)
621 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
623 e60e7f5b 2019-02-10 stsp if [ "$ret" != "0" ]; then
624 21908da4 2019-01-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
625 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
629 21908da4 2019-01-13 stsp test_done "$testroot" "0"
632 6353ad76 2019-02-08 stsp function test_update_merges_file_edits {
633 6353ad76 2019-02-08 stsp local testroot=`test_init update_merges_file_edits`
635 6353ad76 2019-02-08 stsp echo "1" > $testroot/repo/numbers
636 6353ad76 2019-02-08 stsp echo "2" >> $testroot/repo/numbers
637 6353ad76 2019-02-08 stsp echo "3" >> $testroot/repo/numbers
638 6353ad76 2019-02-08 stsp echo "4" >> $testroot/repo/numbers
639 6353ad76 2019-02-08 stsp echo "5" >> $testroot/repo/numbers
640 6353ad76 2019-02-08 stsp echo "6" >> $testroot/repo/numbers
641 6353ad76 2019-02-08 stsp echo "7" >> $testroot/repo/numbers
642 6353ad76 2019-02-08 stsp echo "8" >> $testroot/repo/numbers
643 6353ad76 2019-02-08 stsp (cd $testroot/repo && git add numbers)
644 6353ad76 2019-02-08 stsp git_commit $testroot/repo -m "added numbers file"
645 f69721c3 2019-10-21 stsp local base_commit=`git_show_head $testroot/repo`
647 6353ad76 2019-02-08 stsp got checkout $testroot/repo $testroot/wt > /dev/null
649 e60e7f5b 2019-02-10 stsp if [ "$ret" != "0" ]; then
650 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
654 6353ad76 2019-02-08 stsp echo "modified alpha" > $testroot/repo/alpha
655 6353ad76 2019-02-08 stsp echo "modified beta" > $testroot/repo/beta
656 6353ad76 2019-02-08 stsp sed -i 's/2/22/' $testroot/repo/numbers
657 6353ad76 2019-02-08 stsp git_commit $testroot/repo -m "modified 3 files"
659 6353ad76 2019-02-08 stsp echo "modified alpha, too" > $testroot/wt/alpha
660 6353ad76 2019-02-08 stsp touch $testroot/wt/beta
661 6353ad76 2019-02-08 stsp sed -i 's/7/77/' $testroot/wt/numbers
663 6353ad76 2019-02-08 stsp echo "C alpha" > $testroot/stdout.expected
664 6353ad76 2019-02-08 stsp echo "U beta" >> $testroot/stdout.expected
665 6353ad76 2019-02-08 stsp echo "G numbers" >> $testroot/stdout.expected
666 6353ad76 2019-02-08 stsp echo -n "Updated to commit " >> $testroot/stdout.expected
667 6353ad76 2019-02-08 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
668 6353ad76 2019-02-08 stsp echo >> $testroot/stdout.expected
670 6353ad76 2019-02-08 stsp (cd $testroot/wt && got update > $testroot/stdout)
672 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
674 e60e7f5b 2019-02-10 stsp if [ "$ret" != "0" ]; then
675 6353ad76 2019-02-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
676 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
680 f69721c3 2019-10-21 stsp echo -n "<<<<<<< merged change: commit " > $testroot/content.expected
681 6353ad76 2019-02-08 stsp git_show_head $testroot/repo >> $testroot/content.expected
682 6353ad76 2019-02-08 stsp echo >> $testroot/content.expected
683 6353ad76 2019-02-08 stsp echo "modified alpha" >> $testroot/content.expected
684 f69721c3 2019-10-21 stsp echo "||||||| 3-way merge base: commit $base_commit" \
685 f69721c3 2019-10-21 stsp >> $testroot/content.expected
686 d136cfcb 2019-10-12 stsp echo "alpha" >> $testroot/content.expected
687 6353ad76 2019-02-08 stsp echo "=======" >> $testroot/content.expected
688 6353ad76 2019-02-08 stsp echo "modified alpha, too" >> $testroot/content.expected
689 f69721c3 2019-10-21 stsp echo '>>>>>>>' >> $testroot/content.expected
690 6353ad76 2019-02-08 stsp echo "modified beta" >> $testroot/content.expected
691 6353ad76 2019-02-08 stsp echo "1" >> $testroot/content.expected
692 6353ad76 2019-02-08 stsp echo "22" >> $testroot/content.expected
693 6353ad76 2019-02-08 stsp echo "3" >> $testroot/content.expected
694 6353ad76 2019-02-08 stsp echo "4" >> $testroot/content.expected
695 6353ad76 2019-02-08 stsp echo "5" >> $testroot/content.expected
696 6353ad76 2019-02-08 stsp echo "6" >> $testroot/content.expected
697 6353ad76 2019-02-08 stsp echo "77" >> $testroot/content.expected
698 6353ad76 2019-02-08 stsp echo "8" >> $testroot/content.expected
700 6353ad76 2019-02-08 stsp cat $testroot/wt/alpha > $testroot/content
701 6353ad76 2019-02-08 stsp cat $testroot/wt/beta >> $testroot/content
702 6353ad76 2019-02-08 stsp cat $testroot/wt/numbers >> $testroot/content
704 8d301dd9 2019-05-14 stsp cmp -s $testroot/content.expected $testroot/content
706 6353ad76 2019-02-08 stsp if [ "$ret" != "0" ]; then
707 6353ad76 2019-02-08 stsp diff -u $testroot/content.expected $testroot/content
709 68ed9ba5 2019-02-10 stsp test_done "$testroot" "$ret"
712 68ed9ba5 2019-02-10 stsp function test_update_keeps_xbit {
713 68ed9ba5 2019-02-10 stsp local testroot=`test_init update_keeps_xbit 1`
715 68ed9ba5 2019-02-10 stsp touch $testroot/repo/xfile
716 68ed9ba5 2019-02-10 stsp chmod +x $testroot/repo/xfile
717 68ed9ba5 2019-02-10 stsp (cd $testroot/repo && git add .)
718 68ed9ba5 2019-02-10 stsp git_commit $testroot/repo -m "adding executable file"
720 68ed9ba5 2019-02-10 stsp got checkout $testroot/repo $testroot/wt > $testroot/stdout
722 68ed9ba5 2019-02-10 stsp if [ "$ret" != "0" ]; then
723 68ed9ba5 2019-02-10 stsp test_done "$testroot" "$ret"
727 68ed9ba5 2019-02-10 stsp echo foo > $testroot/repo/xfile
728 68ed9ba5 2019-02-10 stsp git_commit $testroot/repo -m "changed executable file"
730 68ed9ba5 2019-02-10 stsp echo "U xfile" > $testroot/stdout.expected
731 68ed9ba5 2019-02-10 stsp echo -n "Updated to commit " >> $testroot/stdout.expected
732 68ed9ba5 2019-02-10 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
733 68ed9ba5 2019-02-10 stsp echo >> $testroot/stdout.expected
735 68ed9ba5 2019-02-10 stsp (cd $testroot/wt && got update > $testroot/stdout)
737 68ed9ba5 2019-02-10 stsp if [ "$ret" != "0" ]; then
738 68ed9ba5 2019-02-10 stsp test_done "$testroot" "$ret"
742 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
744 68ed9ba5 2019-02-10 stsp if [ "$ret" != "0" ]; then
745 68ed9ba5 2019-02-10 stsp diff -u $testroot/stdout.expected $testroot/stdout
746 68ed9ba5 2019-02-10 stsp test_done "$testroot" "$ret"
750 68ed9ba5 2019-02-10 stsp ls -l $testroot/wt/xfile | grep -q '^-rwx'
752 68ed9ba5 2019-02-10 stsp if [ "$ret" != "0" ]; then
753 68ed9ba5 2019-02-10 stsp echo "file is not executable" >&2
754 68ed9ba5 2019-02-10 stsp ls -l $testroot/wt/xfile >&2
756 6353ad76 2019-02-08 stsp test_done "$testroot" "$ret"
759 ba8a0d4d 2019-02-10 stsp function test_update_clears_xbit {
760 ba8a0d4d 2019-02-10 stsp local testroot=`test_init update_clears_xbit 1`
762 ba8a0d4d 2019-02-10 stsp touch $testroot/repo/xfile
763 ba8a0d4d 2019-02-10 stsp chmod +x $testroot/repo/xfile
764 ba8a0d4d 2019-02-10 stsp (cd $testroot/repo && git add .)
765 ba8a0d4d 2019-02-10 stsp git_commit $testroot/repo -m "adding executable file"
767 ba8a0d4d 2019-02-10 stsp got checkout $testroot/repo $testroot/wt > $testroot/stdout
769 ba8a0d4d 2019-02-10 stsp if [ "$ret" != "0" ]; then
770 ba8a0d4d 2019-02-10 stsp test_done "$testroot" "$ret"
774 ba8a0d4d 2019-02-10 stsp ls -l $testroot/wt/xfile | grep -q '^-rwx'
776 ba8a0d4d 2019-02-10 stsp if [ "$ret" != "0" ]; then
777 ba8a0d4d 2019-02-10 stsp echo "file is not executable" >&2
778 ba8a0d4d 2019-02-10 stsp ls -l $testroot/wt/xfile >&2
779 ba8a0d4d 2019-02-10 stsp test_done "$testroot" "$ret"
783 ba8a0d4d 2019-02-10 stsp # XXX git seems to require a file edit when flipping the x bit?
784 ba8a0d4d 2019-02-10 stsp echo foo > $testroot/repo/xfile
785 ba8a0d4d 2019-02-10 stsp chmod -x $testroot/repo/xfile
786 ba8a0d4d 2019-02-10 stsp git_commit $testroot/repo -m "not an executable file anymore"
788 ba8a0d4d 2019-02-10 stsp echo "U xfile" > $testroot/stdout.expected
789 ba8a0d4d 2019-02-10 stsp echo -n "Updated to commit " >> $testroot/stdout.expected
790 ba8a0d4d 2019-02-10 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
791 ba8a0d4d 2019-02-10 stsp echo >> $testroot/stdout.expected
793 ba8a0d4d 2019-02-10 stsp (cd $testroot/wt && got update > $testroot/stdout)
795 ba8a0d4d 2019-02-10 stsp if [ "$ret" != "0" ]; then
796 ba8a0d4d 2019-02-10 stsp test_done "$testroot" "$ret"
800 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
802 ba8a0d4d 2019-02-10 stsp if [ "$ret" != "0" ]; then
803 ba8a0d4d 2019-02-10 stsp diff -u $testroot/stdout.expected $testroot/stdout
804 ba8a0d4d 2019-02-10 stsp test_done "$testroot" "$ret"
808 ba8a0d4d 2019-02-10 stsp ls -l $testroot/wt/xfile | grep -q '^-rw-'
810 ba8a0d4d 2019-02-10 stsp if [ "$ret" != "0" ]; then
811 ba8a0d4d 2019-02-10 stsp echo "file is unexpectedly executable" >&2
812 ba8a0d4d 2019-02-10 stsp ls -l $testroot/wt/xfile >&2
814 ba8a0d4d 2019-02-10 stsp test_done "$testroot" "$ret"
817 a378724f 2019-02-10 stsp function test_update_restores_missing_file {
818 a378724f 2019-02-10 stsp local testroot=`test_init update_restores_missing_file`
820 a378724f 2019-02-10 stsp got checkout $testroot/repo $testroot/wt > /dev/null
822 a378724f 2019-02-10 stsp if [ "$ret" != "0" ]; then
823 a378724f 2019-02-10 stsp test_done "$testroot" "$ret"
827 a378724f 2019-02-10 stsp rm $testroot/wt/alpha
829 a378724f 2019-02-10 stsp echo "! alpha" > $testroot/stdout.expected
830 1545c615 2019-02-10 stsp echo -n "Updated to commit " >> $testroot/stdout.expected
831 1545c615 2019-02-10 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
832 1545c615 2019-02-10 stsp echo >> $testroot/stdout.expected
833 a378724f 2019-02-10 stsp (cd $testroot/wt && got update > $testroot/stdout)
835 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
837 a378724f 2019-02-10 stsp if [ "$ret" != "0" ]; then
838 a378724f 2019-02-10 stsp diff -u $testroot/stdout.expected $testroot/stdout
839 a378724f 2019-02-10 stsp test_done "$testroot" "$ret"
843 a378724f 2019-02-10 stsp echo "alpha" > $testroot/content.expected
845 a378724f 2019-02-10 stsp cat $testroot/wt/alpha > $testroot/content
847 8d301dd9 2019-05-14 stsp cmp -s $testroot/content.expected $testroot/content
849 1430b4e0 2019-03-27 stsp if [ "$ret" != "0" ]; then
850 1430b4e0 2019-03-27 stsp diff -u $testroot/content.expected $testroot/content
852 1430b4e0 2019-03-27 stsp test_done "$testroot" "$ret"
855 085d5bcf 2019-03-27 stsp function test_update_conflict_wt_add_vs_repo_add {
856 085d5bcf 2019-03-27 stsp local testroot=`test_init update_conflict_wt_add_vs_repo_add`
858 1430b4e0 2019-03-27 stsp got checkout $testroot/repo $testroot/wt > /dev/null
860 1430b4e0 2019-03-27 stsp if [ "$ret" != "0" ]; then
861 1430b4e0 2019-03-27 stsp test_done "$testroot" "$ret"
865 1430b4e0 2019-03-27 stsp echo "new" > $testroot/repo/gamma/new
866 1430b4e0 2019-03-27 stsp (cd $testroot/repo && git add .)
867 1430b4e0 2019-03-27 stsp git_commit $testroot/repo -m "adding a new file"
869 1430b4e0 2019-03-27 stsp echo "also new" > $testroot/wt/gamma/new
870 1430b4e0 2019-03-27 stsp (cd $testroot/wt && got add gamma/new >/dev/null)
872 1430b4e0 2019-03-27 stsp (cd $testroot/wt && got update > $testroot/stdout)
874 1430b4e0 2019-03-27 stsp echo "C gamma/new" > $testroot/stdout.expected
875 1430b4e0 2019-03-27 stsp echo -n "Updated to commit " >> $testroot/stdout.expected
876 1430b4e0 2019-03-27 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
877 1430b4e0 2019-03-27 stsp echo >> $testroot/stdout.expected
878 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
880 1430b4e0 2019-03-27 stsp if [ "$ret" != "0" ]; then
881 1430b4e0 2019-03-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
882 1430b4e0 2019-03-27 stsp test_done "$testroot" "$ret"
886 f69721c3 2019-10-21 stsp echo -n "<<<<<<< merged change: commit " > $testroot/content.expected
887 1430b4e0 2019-03-27 stsp git_show_head $testroot/repo >> $testroot/content.expected
888 1430b4e0 2019-03-27 stsp echo >> $testroot/content.expected
889 1430b4e0 2019-03-27 stsp echo "new" >> $testroot/content.expected
890 1430b4e0 2019-03-27 stsp echo "=======" >> $testroot/content.expected
891 1430b4e0 2019-03-27 stsp echo "also new" >> $testroot/content.expected
892 f69721c3 2019-10-21 stsp echo '>>>>>>>' >> $testroot/content.expected
894 1430b4e0 2019-03-27 stsp cat $testroot/wt/gamma/new > $testroot/content
896 8d301dd9 2019-05-14 stsp cmp -s $testroot/content.expected $testroot/content
898 a378724f 2019-02-10 stsp if [ "$ret" != "0" ]; then
899 a378724f 2019-02-10 stsp diff -u $testroot/content.expected $testroot/content
900 3165301c 2019-03-27 stsp test_done "$testroot" "$ret"
904 3165301c 2019-03-27 stsp # resolve the conflict
905 3165301c 2019-03-27 stsp echo "new and also new" > $testroot/wt/gamma/new
906 3165301c 2019-03-27 stsp echo 'M gamma/new' > $testroot/stdout.expected
907 3165301c 2019-03-27 stsp (cd $testroot/wt && got status > $testroot/stdout)
908 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
910 3165301c 2019-03-27 stsp if [ "$ret" != "0" ]; then
911 3165301c 2019-03-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
913 a378724f 2019-02-10 stsp test_done "$testroot" "$ret"
916 085d5bcf 2019-03-27 stsp function test_update_conflict_wt_edit_vs_repo_rm {
917 085d5bcf 2019-03-27 stsp local testroot=`test_init update_conflict_wt_edit_vs_repo_rm`
919 708d8e67 2019-03-27 stsp got checkout $testroot/repo $testroot/wt > /dev/null
921 708d8e67 2019-03-27 stsp if [ "$ret" != "0" ]; then
922 708d8e67 2019-03-27 stsp test_done "$testroot" "$ret"
926 708d8e67 2019-03-27 stsp (cd $testroot/repo && git rm -q beta)
927 708d8e67 2019-03-27 stsp git_commit $testroot/repo -m "removing a file"
929 708d8e67 2019-03-27 stsp echo "modified beta" > $testroot/wt/beta
931 708d8e67 2019-03-27 stsp (cd $testroot/wt && got update > $testroot/stdout)
933 fc6346c4 2019-03-27 stsp echo "G beta" > $testroot/stdout.expected
934 708d8e67 2019-03-27 stsp echo -n "Updated to commit " >> $testroot/stdout.expected
935 708d8e67 2019-03-27 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
936 708d8e67 2019-03-27 stsp echo >> $testroot/stdout.expected
937 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
939 708d8e67 2019-03-27 stsp if [ "$ret" != "0" ]; then
940 708d8e67 2019-03-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
941 708d8e67 2019-03-27 stsp test_done "$testroot" "$ret"
945 708d8e67 2019-03-27 stsp echo "modified beta" > $testroot/content.expected
947 708d8e67 2019-03-27 stsp cat $testroot/wt/beta > $testroot/content
949 8d301dd9 2019-05-14 stsp cmp -s $testroot/content.expected $testroot/content
951 708d8e67 2019-03-27 stsp if [ "$ret" != "0" ]; then
952 708d8e67 2019-03-27 stsp diff -u $testroot/content.expected $testroot/content
953 708d8e67 2019-03-27 stsp test_done "$testroot" "$ret"
957 fc6346c4 2019-03-27 stsp # beta is now an added file... we don't flag tree conflicts yet
958 fc6346c4 2019-03-27 stsp echo 'A beta' > $testroot/stdout.expected
959 13d9040b 2019-03-27 stsp (cd $testroot/wt && got status > $testroot/stdout)
960 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
962 13d9040b 2019-03-27 stsp if [ "$ret" != "0" ]; then
963 13d9040b 2019-03-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
965 13d9040b 2019-03-27 stsp test_done "$testroot" "$ret"
968 13d9040b 2019-03-27 stsp function test_update_conflict_wt_rm_vs_repo_edit {
969 13d9040b 2019-03-27 stsp local testroot=`test_init update_conflict_wt_rm_vs_repo_edit`
971 13d9040b 2019-03-27 stsp got checkout $testroot/repo $testroot/wt > /dev/null
973 13d9040b 2019-03-27 stsp if [ "$ret" != "0" ]; then
974 13d9040b 2019-03-27 stsp test_done "$testroot" "$ret"
978 13d9040b 2019-03-27 stsp echo "modified beta" > $testroot/repo/beta
979 13d9040b 2019-03-27 stsp git_commit $testroot/repo -m "modified a file"
981 13d9040b 2019-03-27 stsp (cd $testroot/wt && got rm beta > /dev/null)
983 13d9040b 2019-03-27 stsp (cd $testroot/wt && got update > $testroot/stdout)
985 13d9040b 2019-03-27 stsp echo "G beta" > $testroot/stdout.expected
986 13d9040b 2019-03-27 stsp echo -n "Updated to commit " >> $testroot/stdout.expected
987 13d9040b 2019-03-27 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
988 13d9040b 2019-03-27 stsp echo >> $testroot/stdout.expected
989 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
991 13d9040b 2019-03-27 stsp if [ "$ret" != "0" ]; then
992 13d9040b 2019-03-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
993 13d9040b 2019-03-27 stsp test_done "$testroot" "$ret"
997 13d9040b 2019-03-27 stsp # beta remains a deleted file... we don't flag tree conflicts yet
998 13d9040b 2019-03-27 stsp echo 'D beta' > $testroot/stdout.expected
999 708d8e67 2019-03-27 stsp (cd $testroot/wt && got status > $testroot/stdout)
1000 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1002 708d8e67 2019-03-27 stsp if [ "$ret" != "0" ]; then
1003 708d8e67 2019-03-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
1004 13d9040b 2019-03-27 stsp test_done "$testroot" "$ret"
1008 13d9040b 2019-03-27 stsp # 'got diff' should show post-update contents of beta being deleted
1009 13d9040b 2019-03-27 stsp local head_rev=`git_show_head $testroot/repo`
1010 13d9040b 2019-03-27 stsp echo "diff $head_rev $testroot/wt" > $testroot/stdout.expected
1011 13d9040b 2019-03-27 stsp echo -n 'blob - ' >> $testroot/stdout.expected
1012 13d9040b 2019-03-27 stsp got tree -r $testroot/repo -i | grep 'beta$' | cut -d' ' -f 1 \
1013 13d9040b 2019-03-27 stsp >> $testroot/stdout.expected
1014 13d9040b 2019-03-27 stsp echo 'file + /dev/null' >> $testroot/stdout.expected
1015 13d9040b 2019-03-27 stsp echo '--- beta' >> $testroot/stdout.expected
1016 13d9040b 2019-03-27 stsp echo '+++ beta' >> $testroot/stdout.expected
1017 13d9040b 2019-03-27 stsp echo '@@ -1 +0,0 @@' >> $testroot/stdout.expected
1018 13d9040b 2019-03-27 stsp echo '-modified beta' >> $testroot/stdout.expected
1020 13d9040b 2019-03-27 stsp (cd $testroot/wt && got diff > $testroot/stdout)
1021 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1023 13d9040b 2019-03-27 stsp if [ "$ret" != "0" ]; then
1024 13d9040b 2019-03-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
1026 708d8e67 2019-03-27 stsp test_done "$testroot" "$ret"
1029 66b11bf5 2019-03-27 stsp function test_update_conflict_wt_rm_vs_repo_rm {
1030 66b11bf5 2019-03-27 stsp local testroot=`test_init update_conflict_wt_rm_vs_repo_rm`
1032 66b11bf5 2019-03-27 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1034 66b11bf5 2019-03-27 stsp if [ "$ret" != "0" ]; then
1035 66b11bf5 2019-03-27 stsp test_done "$testroot" "$ret"
1039 66b11bf5 2019-03-27 stsp (cd $testroot/repo && git rm -q beta)
1040 66b11bf5 2019-03-27 stsp git_commit $testroot/repo -m "removing a file"
1042 66b11bf5 2019-03-27 stsp (cd $testroot/wt && got rm beta > /dev/null)
1044 66b11bf5 2019-03-27 stsp (cd $testroot/wt && got update > $testroot/stdout)
1046 66b11bf5 2019-03-27 stsp echo "D beta" > $testroot/stdout.expected
1047 66b11bf5 2019-03-27 stsp echo -n "Updated to commit " >> $testroot/stdout.expected
1048 66b11bf5 2019-03-27 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1049 66b11bf5 2019-03-27 stsp echo >> $testroot/stdout.expected
1050 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1052 66b11bf5 2019-03-27 stsp if [ "$ret" != "0" ]; then
1053 66b11bf5 2019-03-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
1054 66b11bf5 2019-03-27 stsp test_done "$testroot" "$ret"
1058 66b11bf5 2019-03-27 stsp # beta is now gone... we don't flag tree conflicts yet
1059 2a06fe5f 2019-08-24 stsp echo "N beta" > $testroot/stdout.expected
1060 54817d72 2019-07-27 stsp echo -n > $testroot/stderr.expected
1061 54817d72 2019-07-27 stsp (cd $testroot/wt && got status beta > $testroot/stdout \
1062 54817d72 2019-07-27 stsp 2> $testroot/stderr)
1063 54817d72 2019-07-27 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1065 54817d72 2019-07-27 stsp if [ "$ret" != "0" ]; then
1066 54817d72 2019-07-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
1067 54817d72 2019-07-27 stsp test_done "$testroot" "$ret"
1070 8d301dd9 2019-05-14 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1072 66b11bf5 2019-03-27 stsp if [ "$ret" != "0" ]; then
1073 66b11bf5 2019-03-27 stsp diff -u $testroot/stderr.expected $testroot/stderr
1074 66b11bf5 2019-03-27 stsp test_done "$testroot" "$ret"
1078 66b11bf5 2019-03-27 stsp if [ -e $testroot/wt/beta ]; then
1079 66b11bf5 2019-03-27 stsp echo "removed file beta still exists on disk" >&2
1080 66b11bf5 2019-03-27 stsp test_done "$testroot" "1"
1084 66b11bf5 2019-03-27 stsp test_done "$testroot" "0"
1087 c4cdcb68 2019-04-03 stsp function test_update_partial {
1088 c4cdcb68 2019-04-03 stsp local testroot=`test_init update_partial`
1090 c4cdcb68 2019-04-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1092 c4cdcb68 2019-04-03 stsp if [ "$ret" != "0" ]; then
1093 c4cdcb68 2019-04-03 stsp test_done "$testroot" "$ret"
1097 c4cdcb68 2019-04-03 stsp echo "modified alpha" > $testroot/repo/alpha
1098 c4cdcb68 2019-04-03 stsp echo "modified beta" > $testroot/repo/beta
1099 c4cdcb68 2019-04-03 stsp echo "modified epsilon/zeta" > $testroot/repo/epsilon/zeta
1100 c4cdcb68 2019-04-03 stsp git_commit $testroot/repo -m "modified two files"
1102 f2ea84fa 2019-07-27 stsp echo "U alpha" > $testroot/stdout.expected
1103 f2ea84fa 2019-07-27 stsp echo "U beta" >> $testroot/stdout.expected
1104 f2ea84fa 2019-07-27 stsp echo -n "Updated to commit " >> $testroot/stdout.expected
1105 f2ea84fa 2019-07-27 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1106 f2ea84fa 2019-07-27 stsp echo >> $testroot/stdout.expected
1108 f2ea84fa 2019-07-27 stsp (cd $testroot/wt && got update alpha beta > $testroot/stdout)
1110 f2ea84fa 2019-07-27 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1112 f2ea84fa 2019-07-27 stsp if [ "$ret" != "0" ]; then
1113 f2ea84fa 2019-07-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
1114 f2ea84fa 2019-07-27 stsp test_done "$testroot" "$ret"
1118 f2ea84fa 2019-07-27 stsp echo "modified alpha" > $testroot/content.expected
1119 f2ea84fa 2019-07-27 stsp echo "modified beta" >> $testroot/content.expected
1121 f2ea84fa 2019-07-27 stsp cat $testroot/wt/alpha $testroot/wt/beta > $testroot/content
1122 f2ea84fa 2019-07-27 stsp cmp -s $testroot/content.expected $testroot/content
1124 f2ea84fa 2019-07-27 stsp if [ "$ret" != "0" ]; then
1125 f2ea84fa 2019-07-27 stsp diff -u $testroot/content.expected $testroot/content
1126 f2ea84fa 2019-07-27 stsp test_done "$testroot" "$ret"
1130 e4d984c2 2019-05-22 stsp echo "U epsilon/zeta" > $testroot/stdout.expected
1131 e4d984c2 2019-05-22 stsp echo -n "Updated to commit " >> $testroot/stdout.expected
1132 e4d984c2 2019-05-22 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1133 e4d984c2 2019-05-22 stsp echo >> $testroot/stdout.expected
1135 e4d984c2 2019-05-22 stsp (cd $testroot/wt && got update epsilon > $testroot/stdout)
1137 e4d984c2 2019-05-22 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1139 e4d984c2 2019-05-22 stsp if [ "$ret" != "0" ]; then
1140 e4d984c2 2019-05-22 stsp diff -u $testroot/stdout.expected $testroot/stdout
1141 e4d984c2 2019-05-22 stsp test_done "$testroot" "$ret"
1145 e4d984c2 2019-05-22 stsp echo "modified epsilon/zeta" > $testroot/content.expected
1146 e4d984c2 2019-05-22 stsp cat $testroot/wt/epsilon/zeta > $testroot/content
1148 e4d984c2 2019-05-22 stsp cmp -s $testroot/content.expected $testroot/content
1150 e4d984c2 2019-05-22 stsp if [ "$ret" != "0" ]; then
1151 e4d984c2 2019-05-22 stsp diff -u $testroot/content.expected $testroot/content
1152 e4d984c2 2019-05-22 stsp test_done "$testroot" "$ret"
1156 c4cdcb68 2019-04-03 stsp test_done "$testroot" "$ret"
1159 c4cdcb68 2019-04-03 stsp function test_update_partial_add {
1160 c4cdcb68 2019-04-03 stsp local testroot=`test_init update_partial_add`
1162 c4cdcb68 2019-04-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1164 c4cdcb68 2019-04-03 stsp if [ "$ret" != "0" ]; then
1165 c4cdcb68 2019-04-03 stsp test_done "$testroot" "$ret"
1169 c4cdcb68 2019-04-03 stsp echo "new" > $testroot/repo/new
1170 c4cdcb68 2019-04-03 stsp echo "epsilon/new2" > $testroot/repo/epsilon/new2
1171 c4cdcb68 2019-04-03 stsp (cd $testroot/repo && git add .)
1172 c4cdcb68 2019-04-03 stsp git_commit $testroot/repo -m "added two files"
1174 f2ea84fa 2019-07-27 stsp echo "A new" > $testroot/stdout.expected
1175 f2ea84fa 2019-07-27 stsp echo "A epsilon/new2" >> $testroot/stdout.expected
1176 f2ea84fa 2019-07-27 stsp echo -n "Updated to commit " >> $testroot/stdout.expected
1177 f2ea84fa 2019-07-27 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1178 f2ea84fa 2019-07-27 stsp echo >> $testroot/stdout.expected
1180 f2ea84fa 2019-07-27 stsp (cd $testroot/wt && got update new epsilon/new2 > $testroot/stdout)
1182 f2ea84fa 2019-07-27 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1184 f2ea84fa 2019-07-27 stsp if [ "$ret" != "0" ]; then
1185 f2ea84fa 2019-07-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
1186 f2ea84fa 2019-07-27 stsp test_done "$testroot" "$ret"
1190 f2ea84fa 2019-07-27 stsp echo "new" > $testroot/content.expected
1191 f2ea84fa 2019-07-27 stsp echo "epsilon/new2" >> $testroot/content.expected
1193 f2ea84fa 2019-07-27 stsp cat $testroot/wt/new $testroot/wt/epsilon/new2 > $testroot/content
1195 f2ea84fa 2019-07-27 stsp cmp -s $testroot/content.expected $testroot/content
1197 f2ea84fa 2019-07-27 stsp if [ "$ret" != "0" ]; then
1198 f2ea84fa 2019-07-27 stsp diff -u $testroot/content.expected $testroot/content
1200 c4cdcb68 2019-04-03 stsp test_done "$testroot" "$ret"
1203 c4cdcb68 2019-04-03 stsp function test_update_partial_rm {
1204 c4cdcb68 2019-04-03 stsp local testroot=`test_init update_partial_rm`
1206 c4cdcb68 2019-04-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1208 c4cdcb68 2019-04-03 stsp if [ "$ret" != "0" ]; then
1209 c4cdcb68 2019-04-03 stsp test_done "$testroot" "$ret"
1213 f2ea84fa 2019-07-27 stsp (cd $testroot/repo && git rm -q alpha epsilon/zeta)
1214 c4cdcb68 2019-04-03 stsp git_commit $testroot/repo -m "removed two files"
1216 f2ea84fa 2019-07-27 stsp echo "got: no such entry found in tree" \
1217 f2ea84fa 2019-07-27 stsp > $testroot/stderr.expected
1219 f2ea84fa 2019-07-27 stsp (cd $testroot/wt && got update alpha epsilon/zeta 2> $testroot/stderr)
1221 f2ea84fa 2019-07-27 stsp if [ "$ret" == "0" ]; then
1222 f2ea84fa 2019-07-27 stsp echo "update succeeded unexpectedly" >&2
1223 f2ea84fa 2019-07-27 stsp test_done "$testroot" "1"
1227 f2ea84fa 2019-07-27 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1229 f2ea84fa 2019-07-27 stsp if [ "$ret" != "0" ]; then
1230 f2ea84fa 2019-07-27 stsp diff -u $testroot/stderr.expected $testroot/stderr
1231 f2ea84fa 2019-07-27 stsp test_done "$testroot" "$ret"
1234 c4cdcb68 2019-04-03 stsp test_done "$testroot" "$ret"
1237 c4cdcb68 2019-04-03 stsp function test_update_partial_dir {
1238 c4cdcb68 2019-04-03 stsp local testroot=`test_init update_partial_dir`
1240 c4cdcb68 2019-04-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1242 c4cdcb68 2019-04-03 stsp if [ "$ret" != "0" ]; then
1243 c4cdcb68 2019-04-03 stsp test_done "$testroot" "$ret"
1247 c4cdcb68 2019-04-03 stsp echo "modified alpha" > $testroot/repo/alpha
1248 c4cdcb68 2019-04-03 stsp echo "modified beta" > $testroot/repo/beta
1249 c4cdcb68 2019-04-03 stsp echo "modified epsilon/zeta" > $testroot/repo/epsilon/zeta
1250 c4cdcb68 2019-04-03 stsp git_commit $testroot/repo -m "modified two files"
1252 c4cdcb68 2019-04-03 stsp echo "U epsilon/zeta" > $testroot/stdout.expected
1253 c4cdcb68 2019-04-03 stsp echo -n "Updated to commit " >> $testroot/stdout.expected
1254 c4cdcb68 2019-04-03 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1255 c4cdcb68 2019-04-03 stsp echo >> $testroot/stdout.expected
1257 c4cdcb68 2019-04-03 stsp (cd $testroot/wt && got update epsilon > $testroot/stdout)
1259 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1261 c4cdcb68 2019-04-03 stsp if [ "$ret" != "0" ]; then
1262 c4cdcb68 2019-04-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
1263 c4cdcb68 2019-04-03 stsp test_done "$testroot" "$ret"
1267 c4cdcb68 2019-04-03 stsp echo "modified epsilon/zeta" > $testroot/content.expected
1268 c4cdcb68 2019-04-03 stsp cat $testroot/wt/epsilon/zeta > $testroot/content
1270 8d301dd9 2019-05-14 stsp cmp -s $testroot/content.expected $testroot/content
1272 c4cdcb68 2019-04-03 stsp if [ "$ret" != "0" ]; then
1273 c4cdcb68 2019-04-03 stsp diff -u $testroot/content.expected $testroot/content
1274 c4cdcb68 2019-04-03 stsp test_done "$testroot" "$ret"
1277 c4cdcb68 2019-04-03 stsp test_done "$testroot" "$ret"
1281 d5bea539 2019-05-13 stsp function test_update_moved_branch_ref {
1282 d5bea539 2019-05-13 stsp local testroot=`test_init update_moved_branch_ref`
1284 d5bea539 2019-05-13 stsp git clone -q --mirror $testroot/repo $testroot/repo2
1286 d5bea539 2019-05-13 stsp echo "modified alpha with git" > $testroot/repo/alpha
1287 d5bea539 2019-05-13 stsp git_commit $testroot/repo -m "modified alpha with git"
1289 d5bea539 2019-05-13 stsp got checkout $testroot/repo2 $testroot/wt > /dev/null
1291 d5bea539 2019-05-13 stsp if [ "$ret" != "0" ]; then
1292 d5bea539 2019-05-13 stsp test_done "$testroot" "$ret"
1296 d5bea539 2019-05-13 stsp echo "modified alpha with got" > $testroot/wt/alpha
1297 d5bea539 2019-05-13 stsp (cd $testroot/wt && got commit -m "modified alpha with got" > /dev/null)
1299 d5bea539 2019-05-13 stsp # + xxxxxxx...yyyyyyy master -> master (forced update)
1300 d5bea539 2019-05-13 stsp (cd $testroot/repo2 && git fetch -q --all)
1302 d5bea539 2019-05-13 stsp echo -n > $testroot/stdout.expected
1303 a1fb16d8 2019-05-24 stsp echo -n "got: work tree's head reference now points to a different " \
1304 a367ff0f 2019-05-14 stsp > $testroot/stderr.expected
1305 a1fb16d8 2019-05-24 stsp echo "branch; new head reference and/or update -b required" \
1306 a1fb16d8 2019-05-24 stsp >> $testroot/stderr.expected
1308 d5bea539 2019-05-13 stsp (cd $testroot/wt && got update > $testroot/stdout 2> $testroot/stderr)
1310 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1312 d5bea539 2019-05-13 stsp if [ "$ret" != "0" ]; then
1313 d5bea539 2019-05-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
1314 d5bea539 2019-05-13 stsp test_done "$testroot" "$ret"
1318 8d301dd9 2019-05-14 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1320 d5bea539 2019-05-13 stsp if [ "$ret" != "0" ]; then
1321 d5bea539 2019-05-13 stsp diff -u $testroot/stderr.expected $testroot/stderr
1323 d5bea539 2019-05-13 stsp test_done "$testroot" "$ret"
1326 024e9686 2019-05-14 stsp function test_update_to_another_branch {
1327 024e9686 2019-05-14 stsp local testroot=`test_init update_to_another_branch`
1328 f69721c3 2019-10-21 stsp local base_commit=`git_show_head $testroot/repo`
1330 024e9686 2019-05-14 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1332 024e9686 2019-05-14 stsp if [ "$ret" != "0" ]; then
1333 024e9686 2019-05-14 stsp test_done "$testroot" "$ret"
1337 024e9686 2019-05-14 stsp echo 'refs/heads/master'> $testroot/head-ref.expected
1338 024e9686 2019-05-14 stsp cmp -s $testroot/head-ref.expected $testroot/wt/.got/head-ref
1340 024e9686 2019-05-14 stsp if [ "$ret" != "0" ]; then
1341 024e9686 2019-05-14 stsp diff -u $testroot/head-ref.expected $testroot/wt/.got/head-ref
1342 024e9686 2019-05-14 stsp test_done "$testroot" "$ret"
1346 024e9686 2019-05-14 stsp (cd $testroot/repo && git checkout -q -b newbranch)
1347 024e9686 2019-05-14 stsp echo "modified alpha on new branch" > $testroot/repo/alpha
1348 024e9686 2019-05-14 stsp git_commit $testroot/repo -m "modified alpha on new branch"
1350 024e9686 2019-05-14 stsp echo "modified alpha in work tree" > $testroot/wt/alpha
1352 d969fa15 2019-05-22 stsp echo "Switching work tree from refs/heads/master to refs/heads/newbranch" > $testroot/stdout.expected
1353 d969fa15 2019-05-22 stsp echo "C alpha" >> $testroot/stdout.expected
1354 024e9686 2019-05-14 stsp echo -n "Updated to commit " >> $testroot/stdout.expected
1355 024e9686 2019-05-14 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1356 024e9686 2019-05-14 stsp echo >> $testroot/stdout.expected
1358 024e9686 2019-05-14 stsp (cd $testroot/wt && got update -b newbranch > $testroot/stdout)
1360 024e9686 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1362 024e9686 2019-05-14 stsp if [ "$ret" != "0" ]; then
1363 024e9686 2019-05-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
1364 024e9686 2019-05-14 stsp test_done "$testroot" "$ret"
1368 f69721c3 2019-10-21 stsp echo -n "<<<<<<< merged change: commit " > $testroot/content.expected
1369 024e9686 2019-05-14 stsp git_show_head $testroot/repo >> $testroot/content.expected
1370 024e9686 2019-05-14 stsp echo >> $testroot/content.expected
1371 024e9686 2019-05-14 stsp echo "modified alpha on new branch" >> $testroot/content.expected
1372 f69721c3 2019-10-21 stsp echo "||||||| 3-way merge base: commit $base_commit" \
1373 f69721c3 2019-10-21 stsp >> $testroot/content.expected
1374 d136cfcb 2019-10-12 stsp echo "alpha" >> $testroot/content.expected
1375 024e9686 2019-05-14 stsp echo "=======" >> $testroot/content.expected
1376 024e9686 2019-05-14 stsp echo "modified alpha in work tree" >> $testroot/content.expected
1377 f69721c3 2019-10-21 stsp echo '>>>>>>>' >> $testroot/content.expected
1379 024e9686 2019-05-14 stsp cat $testroot/wt/alpha > $testroot/content
1381 024e9686 2019-05-14 stsp cmp -s $testroot/content.expected $testroot/content
1383 024e9686 2019-05-14 stsp if [ "$ret" != "0" ]; then
1384 024e9686 2019-05-14 stsp diff -u $testroot/content.expected $testroot/content
1385 024e9686 2019-05-14 stsp test_done "$testroot" "$ret"
1389 024e9686 2019-05-14 stsp echo 'refs/heads/newbranch'> $testroot/head-ref.expected
1390 024e9686 2019-05-14 stsp cmp -s $testroot/head-ref.expected $testroot/wt/.got/head-ref
1392 024e9686 2019-05-14 stsp if [ "$ret" != "0" ]; then
1393 024e9686 2019-05-14 stsp diff -u $testroot/head-ref.expected $testroot/wt/.got/head-ref
1394 a367ff0f 2019-05-14 stsp test_done "$testroot" "$ret"
1398 a367ff0f 2019-05-14 stsp test_done "$testroot" "$ret"
1401 a367ff0f 2019-05-14 stsp function test_update_to_commit_on_wrong_branch {
1402 a367ff0f 2019-05-14 stsp local testroot=`test_init update_to_commit_on_wrong_branch`
1404 a367ff0f 2019-05-14 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1406 a367ff0f 2019-05-14 stsp if [ "$ret" != "0" ]; then
1407 a367ff0f 2019-05-14 stsp test_done "$testroot" "$ret"
1411 a367ff0f 2019-05-14 stsp (cd $testroot/repo && git checkout -q -b newbranch)
1412 a367ff0f 2019-05-14 stsp echo "modified alpha on new branch" > $testroot/repo/alpha
1413 a367ff0f 2019-05-14 stsp git_commit $testroot/repo -m "modified alpha on new branch"
1415 a367ff0f 2019-05-14 stsp echo -n "" > $testroot/stdout.expected
1416 a367ff0f 2019-05-14 stsp echo "got: target commit is on a different branch" \
1417 a367ff0f 2019-05-14 stsp > $testroot/stderr.expected
1419 a367ff0f 2019-05-14 stsp local head_rev=`git_show_head $testroot/repo`
1420 a367ff0f 2019-05-14 stsp (cd $testroot/wt && got update -c $head_rev > $testroot/stdout \
1421 a367ff0f 2019-05-14 stsp 2> $testroot/stderr)
1423 a367ff0f 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1425 a367ff0f 2019-05-14 stsp if [ "$ret" != "0" ]; then
1426 a367ff0f 2019-05-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
1427 024e9686 2019-05-14 stsp test_done "$testroot" "$ret"
1431 a367ff0f 2019-05-14 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1433 a367ff0f 2019-05-14 stsp if [ "$ret" != "0" ]; then
1434 a367ff0f 2019-05-14 stsp diff -u $testroot/stderr.expected $testroot/stderr
1435 a367ff0f 2019-05-14 stsp test_done "$testroot" "$ret"
1439 024e9686 2019-05-14 stsp test_done "$testroot" "$ret"
1442 c932eeeb 2019-05-22 stsp function test_update_bumps_base_commit_id {
1443 a5e55564 2019-06-10 stsp local testroot=`test_init update_bumps_base_commit_id`
1445 1a36436d 2019-06-10 stsp echo "psi" > $testroot/repo/epsilon/psi
1446 1a36436d 2019-06-10 stsp (cd $testroot/repo && git add .)
1447 1a36436d 2019-06-10 stsp git_commit $testroot/repo -m "adding another file"
1449 c932eeeb 2019-05-22 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1451 c932eeeb 2019-05-22 stsp if [ "$ret" != "0" ]; then
1452 c932eeeb 2019-05-22 stsp test_done "$testroot" "$ret"
1456 1a36436d 2019-06-10 stsp echo "modified psi" > $testroot/wt/epsilon/psi
1457 1a36436d 2019-06-10 stsp (cd $testroot/wt && got commit -m "changed psi" > $testroot/stdout)
1459 c932eeeb 2019-05-22 stsp local head_rev=`git_show_head $testroot/repo`
1460 1a36436d 2019-06-10 stsp echo "M epsilon/psi" > $testroot/stdout.expected
1461 a7648d7a 2019-06-02 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
1462 c932eeeb 2019-05-22 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1464 c932eeeb 2019-05-22 stsp if [ "$ret" != "0" ]; then
1465 c932eeeb 2019-05-22 stsp diff -u $testroot/stdout.expected $testroot/stdout
1466 c932eeeb 2019-05-22 stsp test_done "$testroot" "$ret"
1470 305993b9 2019-07-28 stsp echo "changed zeta with git" > $testroot/repo/epsilon/zeta
1471 9bead371 2019-07-28 stsp (cd $testroot/repo && git add .)
1472 9bead371 2019-07-28 stsp git_commit $testroot/repo -m "changing zeta with git"
1474 1a36436d 2019-06-10 stsp echo "modified zeta" > $testroot/wt/epsilon/zeta
1475 1a36436d 2019-06-10 stsp (cd $testroot/wt && got commit -m "changed zeta" > $testroot/stdout \
1476 c932eeeb 2019-05-22 stsp 2> $testroot/stderr)
1478 c932eeeb 2019-05-22 stsp echo -n "" > $testroot/stdout.expected
1479 c932eeeb 2019-05-22 stsp echo "got: work tree must be updated before these changes can be committed" > $testroot/stderr.expected
1480 c932eeeb 2019-05-22 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1482 c932eeeb 2019-05-22 stsp if [ "$ret" != "0" ]; then
1483 c932eeeb 2019-05-22 stsp diff -u $testroot/stderr.expected $testroot/stderr
1484 c932eeeb 2019-05-22 stsp test_done "$testroot" "$ret"
1488 c932eeeb 2019-05-22 stsp (cd $testroot/wt && got update > $testroot/stdout)
1490 9bead371 2019-07-28 stsp echo "U epsilon/psi" > $testroot/stdout.expected
1491 9bead371 2019-07-28 stsp echo "C epsilon/zeta" >> $testroot/stdout.expected
1492 a484d721 2019-06-10 stsp echo -n "Updated to commit " >> $testroot/stdout.expected
1493 a484d721 2019-06-10 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1494 a484d721 2019-06-10 stsp echo >> $testroot/stdout.expected
1495 c932eeeb 2019-05-22 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1497 c932eeeb 2019-05-22 stsp if [ "$ret" != "0" ]; then
1498 c932eeeb 2019-05-22 stsp diff -u $testroot/stdout.expected $testroot/stdout
1499 c932eeeb 2019-05-22 stsp test_done "$testroot" "$ret"
1503 9bead371 2019-07-28 stsp # resolve conflict
1504 9bead371 2019-07-28 stsp echo "modified zeta with got and git" > $testroot/wt/epsilon/zeta
1506 1a36436d 2019-06-10 stsp (cd $testroot/wt && got commit -m "changed zeta" > $testroot/stdout)
1508 c932eeeb 2019-05-22 stsp local head_rev=`git_show_head $testroot/repo`
1509 1a36436d 2019-06-10 stsp echo "M epsilon/zeta" > $testroot/stdout.expected
1510 a7648d7a 2019-06-02 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
1511 303e2782 2019-08-09 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1513 303e2782 2019-08-09 stsp if [ "$ret" != "0" ]; then
1514 303e2782 2019-08-09 stsp diff -u $testroot/stdout.expected $testroot/stdout
1515 303e2782 2019-08-09 stsp test_done "$testroot" "$ret"
1519 303e2782 2019-08-09 stsp test_done "$testroot" "$ret"
1522 303e2782 2019-08-09 stsp function test_update_tag {
1523 303e2782 2019-08-09 stsp local testroot=`test_init update_tag`
1524 303e2782 2019-08-09 stsp local tag="1.0.0"
1526 303e2782 2019-08-09 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1528 303e2782 2019-08-09 stsp if [ "$ret" != "0" ]; then
1529 303e2782 2019-08-09 stsp test_done "$testroot" "$ret"
1533 303e2782 2019-08-09 stsp echo "modified alpha" > $testroot/repo/alpha
1534 303e2782 2019-08-09 stsp git_commit $testroot/repo -m "modified alpha"
1535 303e2782 2019-08-09 stsp (cd $testroot/repo && git tag -m "test" -a $tag)
1537 303e2782 2019-08-09 stsp echo "U alpha" > $testroot/stdout.expected
1538 303e2782 2019-08-09 stsp echo -n "Updated to commit " >> $testroot/stdout.expected
1539 303e2782 2019-08-09 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1540 303e2782 2019-08-09 stsp echo >> $testroot/stdout.expected
1542 303e2782 2019-08-09 stsp (cd $testroot/wt && got update -c $tag > $testroot/stdout)
1544 c932eeeb 2019-05-22 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1546 c932eeeb 2019-05-22 stsp if [ "$ret" != "0" ]; then
1547 c932eeeb 2019-05-22 stsp diff -u $testroot/stdout.expected $testroot/stdout
1548 c932eeeb 2019-05-22 stsp test_done "$testroot" "$ret"
1552 303e2782 2019-08-09 stsp echo "modified alpha" > $testroot/content.expected
1553 303e2782 2019-08-09 stsp cat $testroot/wt/alpha > $testroot/content
1555 303e2782 2019-08-09 stsp cmp -s $testroot/content.expected $testroot/content
1557 303e2782 2019-08-09 stsp if [ "$ret" != "0" ]; then
1558 303e2782 2019-08-09 stsp diff -u $testroot/content.expected $testroot/content
1560 523b8417 2019-10-19 stsp test_done "$testroot" "$ret"
1563 523b8417 2019-10-19 stsp function test_update_toggles_xbit {
1564 523b8417 2019-10-19 stsp local testroot=`test_init update_toggles_xbit 1`
1566 523b8417 2019-10-19 stsp touch $testroot/repo/xfile
1567 523b8417 2019-10-19 stsp chmod +x $testroot/repo/xfile
1568 523b8417 2019-10-19 stsp (cd $testroot/repo && git add .)
1569 523b8417 2019-10-19 stsp git_commit $testroot/repo -m "adding executable file"
1570 523b8417 2019-10-19 stsp local commit_id1=`git_show_head $testroot/repo`
1572 523b8417 2019-10-19 stsp got checkout $testroot/repo $testroot/wt > $testroot/stdout
1574 523b8417 2019-10-19 stsp if [ "$ret" != "0" ]; then
1575 523b8417 2019-10-19 stsp test_done "$testroot" "$ret"
1579 523b8417 2019-10-19 stsp ls -l $testroot/wt/xfile | grep -q '^-rwx'
1581 523b8417 2019-10-19 stsp if [ "$ret" != "0" ]; then
1582 523b8417 2019-10-19 stsp echo "file is not executable" >&2
1583 523b8417 2019-10-19 stsp ls -l $testroot/wt/xfile >&2
1584 523b8417 2019-10-19 stsp test_done "$testroot" "$ret"
1588 523b8417 2019-10-19 stsp chmod -x $testroot/wt/xfile
1589 523b8417 2019-10-19 stsp (cd $testroot/wt && got commit -m "clear x bit" >/dev/null)
1590 523b8417 2019-10-19 stsp local commit_id2=`git_show_head $testroot/repo`
1592 523b8417 2019-10-19 stsp echo "U xfile" > $testroot/stdout.expected
1593 523b8417 2019-10-19 stsp echo -n "Updated to commit " >> $testroot/stdout.expected
1594 523b8417 2019-10-19 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1595 523b8417 2019-10-19 stsp echo >> $testroot/stdout.expected
1597 523b8417 2019-10-19 stsp (cd $testroot/wt && got update -c $commit_id1 > $testroot/stdout)
1599 523b8417 2019-10-19 stsp if [ "$ret" != "0" ]; then
1600 523b8417 2019-10-19 stsp test_done "$testroot" "$ret"
1604 523b8417 2019-10-19 stsp echo "U xfile" > $testroot/stdout.expected
1605 523b8417 2019-10-19 stsp echo "Updated to commit $commit_id1" >> $testroot/stdout.expected
1606 523b8417 2019-10-19 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1608 523b8417 2019-10-19 stsp if [ "$ret" != "0" ]; then
1609 523b8417 2019-10-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
1610 523b8417 2019-10-19 stsp test_done "$testroot" "$ret"
1615 523b8417 2019-10-19 stsp ls -l $testroot/wt/xfile | grep -q '^-rwx'
1617 523b8417 2019-10-19 stsp if [ "$ret" != "0" ]; then
1618 523b8417 2019-10-19 stsp echo "file is not executable" >&2
1619 523b8417 2019-10-19 stsp ls -l $testroot/wt/xfile >&2
1620 523b8417 2019-10-19 stsp test_done "$testroot" "$ret"
1624 523b8417 2019-10-19 stsp (cd $testroot/wt && got update > $testroot/stdout)
1626 523b8417 2019-10-19 stsp if [ "$ret" != "0" ]; then
1627 523b8417 2019-10-19 stsp test_done "$testroot" "$ret"
1631 523b8417 2019-10-19 stsp echo "U xfile" > $testroot/stdout.expected
1632 523b8417 2019-10-19 stsp echo "Updated to commit $commit_id2" >> $testroot/stdout.expected
1633 523b8417 2019-10-19 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1635 523b8417 2019-10-19 stsp if [ "$ret" != "0" ]; then
1636 523b8417 2019-10-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
1637 523b8417 2019-10-19 stsp test_done "$testroot" "$ret"
1641 523b8417 2019-10-19 stsp ls -l $testroot/wt/xfile | grep -q '^-rw-'
1643 523b8417 2019-10-19 stsp if [ "$ret" != "0" ]; then
1644 523b8417 2019-10-19 stsp echo "file is unexpectedly executable" >&2
1645 523b8417 2019-10-19 stsp ls -l $testroot/wt/xfile >&2
1647 c932eeeb 2019-05-22 stsp test_done "$testroot" "$ret"
1650 c84d8c75 2019-01-02 stsp run_test test_update_basic
1651 3b4d3732 2019-01-02 stsp run_test test_update_adds_file
1652 512f0d0e 2019-01-02 stsp run_test test_update_deletes_file
1653 f5c49f82 2019-01-06 stsp run_test test_update_deletes_dir
1654 5cc266ba 2019-01-06 stsp run_test test_update_deletes_dir_with_path_prefix
1655 90285c3b 2019-01-08 stsp run_test test_update_deletes_dir_recursively
1656 4482e97b 2019-01-08 stsp run_test test_update_sibling_dirs_with_common_prefix
1657 50952927 2019-01-12 stsp run_test test_update_dir_with_dot_sibling
1658 46cee7a3 2019-01-12 stsp run_test test_update_moves_files_upwards
1659 bd4792ec 2019-01-13 stsp run_test test_update_moves_files_to_new_dir
1660 4a1ddfc2 2019-01-12 stsp run_test test_update_creates_missing_parent
1661 bd4792ec 2019-01-13 stsp run_test test_update_creates_missing_parent_with_subdir
1662 21908da4 2019-01-13 stsp run_test test_update_file_in_subsubdir
1663 6353ad76 2019-02-08 stsp run_test test_update_merges_file_edits
1664 68ed9ba5 2019-02-10 stsp run_test test_update_keeps_xbit
1665 ba8a0d4d 2019-02-10 stsp run_test test_update_clears_xbit
1666 a378724f 2019-02-10 stsp run_test test_update_restores_missing_file
1667 085d5bcf 2019-03-27 stsp run_test test_update_conflict_wt_add_vs_repo_add
1668 085d5bcf 2019-03-27 stsp run_test test_update_conflict_wt_edit_vs_repo_rm
1669 13d9040b 2019-03-27 stsp run_test test_update_conflict_wt_rm_vs_repo_edit
1670 66b11bf5 2019-03-27 stsp run_test test_update_conflict_wt_rm_vs_repo_rm
1671 c4cdcb68 2019-04-03 stsp run_test test_update_partial
1672 c4cdcb68 2019-04-03 stsp run_test test_update_partial_add
1673 c4cdcb68 2019-04-03 stsp run_test test_update_partial_rm
1674 c4cdcb68 2019-04-03 stsp run_test test_update_partial_dir
1675 d5bea539 2019-05-13 stsp run_test test_update_moved_branch_ref
1676 024e9686 2019-05-14 stsp run_test test_update_to_another_branch
1677 a367ff0f 2019-05-14 stsp run_test test_update_to_commit_on_wrong_branch
1678 c932eeeb 2019-05-22 stsp run_test test_update_bumps_base_commit_id
1679 303e2782 2019-08-09 stsp run_test test_update_tag
1680 523b8417 2019-10-19 stsp run_test test_update_toggles_xbit