make -C regress/cmdline -f Makefile.linux make[1]: Entering directory '/home/op/got-portable/regress/cmdline' ./checkout.sh -q -r "/tmp" ./update.sh -q -r "/tmp" --- /tmp/got-test-update_symlink_conflicts-8x0OXZ7D/stdout.expected 2021-09-23 09:00:58.532444826 +0200 +++ /tmp/got-test-update_symlink_conflicts-8x0OXZ7D/stdout 2021-09-23 09:00:58.529444810 +0200 @@ -1,10 +1,3 @@ C alpha.link C dotgotbar.link C dotgotfoo.link -C epsilon/beta.link -C epsilon.link -C new.link -C nonexistent.link -G zeta.link -Updated to refs/heads/master: 0a032a801cf95e20eb5c1d5339b8abfc70e58a36 -Files with new merge conflicts: 7 test failed; leaving test data in /tmp/got-test-update_symlink_conflicts-8x0OXZ7D ./status.sh -q -r "/tmp" On branch master nothing to commit, working tree clean --- /tmp/got-test-status_shows_no_mods_after_complete_merge-QFzyX0Oz/stdout.expected 2021-09-23 09:01:00.794457417 +0200 +++ /tmp/got-test-status_shows_no_mods_after_complete_merge-QFzyX0Oz/stdout 2021-09-23 09:01:00.845457701 +0200 @@ -1,2 +1 @@ -G numbers -Updated to refs/heads/master: d91a719b0ad5474f1166dc44a72f275426956bc7 +Already up-to-date test failed; leaving test data in /tmp/got-test-status_shows_no_mods_after_complete_merge-QFzyX0Oz ./log.sh -q -r "/tmp" ./add.sh -q -r "/tmp" ./rm.sh -q -r "/tmp" ./diff.sh -q -r "/tmp" ./blame.sh -q -r "/tmp" --- /tmp/got-test-blame_all_lines_replaced-oSGxx18H/stdout.expected 2021-09-23 09:01:06.920491514 +0200 +++ /tmp/got-test-blame_all_lines_replaced-oSGxx18H/stdout 2021-09-23 09:01:06.900491402 +0200 @@ -1,8 +0,0 @@ -1) 565dce7b 2021-09-23 flan_hac 1 -2) 565dce7b 2021-09-23 flan_hac 2 -3) 565dce7b 2021-09-23 flan_hac 3 -4) 565dce7b 2021-09-23 flan_hac 4 -5) 565dce7b 2021-09-23 flan_hac 5 -6) 565dce7b 2021-09-23 flan_hac 6 -7) 565dce7b 2021-09-23 flan_hac 7 -8) 565dce7b 2021-09-23 flan_hac 8 test failed; leaving test data in /tmp/got-test-blame_all_lines_replaced-oSGxx18H --- /tmp/got-test-blame_lines_shifted_up-mNJZMH09/stdout.expected 2021-09-23 09:01:07.051492243 +0200 +++ /tmp/got-test-blame_lines_shifted_up-mNJZMH09/stdout 2021-09-23 09:01:07.050492237 +0200 @@ -1,8 +1,3 @@ -1) 565dce7b 2021-09-23 flan_hac 1 -2) 565dce7b 2021-09-23 flan_hac 2 -3) 257b81fb 2021-09-23 flan_hac foo -4) 257b81fb 2021-09-23 flan_hac bar -5) 257b81fb 2021-09-23 flan_hac baz -6) 565dce7b 2021-09-23 flan_hac 6 -7) 565dce7b 2021-09-23 flan_hac 7 -8) 565dce7b 2021-09-23 flan_hac 8 +1) 257b81fb 2021-09-23 flan_hac foo +2) 257b81fb 2021-09-23 flan_hac bar +3) 257b81fb 2021-09-23 flan_hac baz test failed; leaving test data in /tmp/got-test-blame_lines_shifted_up-mNJZMH09 --- /tmp/got-test-blame_lines_shifted_down-3YF50Oyl/stdout.expected 2021-09-23 09:01:07.184492983 +0200 +++ /tmp/got-test-blame_lines_shifted_down-3YF50Oyl/stdout 2021-09-23 09:01:07.182492972 +0200 @@ -1,11 +1,3 @@ -01) 892ec2ab 2021-09-23 flan_hac 1 -02) 892ec2ab 2021-09-23 flan_hac 2 -03) c8d2986a 2021-09-23 flan_hac foo -04) c8d2986a 2021-09-23 flan_hac bar -05) c8d2986a 2021-09-23 flan_hac baz -06) 892ec2ab 2021-09-23 flan_hac 3 -07) 892ec2ab 2021-09-23 flan_hac 4 -08) 892ec2ab 2021-09-23 flan_hac 5 -09) 892ec2ab 2021-09-23 flan_hac 6 -10) 892ec2ab 2021-09-23 flan_hac 7 -11) c8d2986a 2021-09-23 flan_hac 8 +1) c8d2986a 2021-09-23 flan_hac foo +2) c8d2986a 2021-09-23 flan_hac bar +3) c8d2986a 2021-09-23 flan_hac baz test failed; leaving test data in /tmp/got-test-blame_lines_shifted_down-3YF50Oyl ./branch.sh -q -r "/tmp" ./tag.sh -q -r "/tmp" ./ref.sh -q -r "/tmp" ./commit.sh -q -r "/tmp" ./revert.sh -q -r "/tmp" --- /tmp/got-test-revert_patch-X6ShK4fw/stdout.expected 2021-09-23 09:01:13.938530575 +0200 +++ /tmp/got-test-revert_patch-X6ShK4fw/stdout 2021-09-23 09:01:13.925530503 +0200 @@ -1,34 +0,0 @@ ------------------------------------------------ -@@ -1,5 +1,5 @@ - 1 --2 -+a - 3 - 4 - 5 ------------------------------------------------ -M numbers (change 1 of 3) -revert this change? [y/n/q] n ------------------------------------------------ -@@ -4,7 +4,7 @@ - 4 - 5 - 6 --7 -+b - 8 - 9 - 10 ------------------------------------------------ -M numbers (change 2 of 3) -revert this change? [y/n/q] n ------------------------------------------------ -@@ -13,4 +13,4 @@ - 13 - 14 - 15 --16 -+c ------------------------------------------------ -M numbers (change 3 of 3) -revert this change? [y/n/q] n test failed; leaving test data in /tmp/got-test-revert_patch-X6ShK4fw --- /tmp/got-test-revert_patch_one_change-tg8plxbC/stdout.expected 2021-09-23 09:01:14.202532044 +0200 +++ /tmp/got-test-revert_patch_one_change-tg8plxbC/stdout 2021-09-23 09:01:14.190531978 +0200 @@ -1,11 +0,0 @@ ------------------------------------------------ -@@ -1,5 +1,5 @@ - 1 --2 -+aa - 3 - 4 - 5 ------------------------------------------------ -M numbers (change 1 of 1) -revert this change? [y/n/q] y test failed; leaving test data in /tmp/got-test-revert_patch_one_change-tg8plxbC ./cherrypick.sh -q -r "/tmp" --- /tmp/got-test-cherrypick_symlink_conflicts-Jv2WWaeI/stdout.expected 2021-09-23 09:01:16.056542364 +0200 +++ /tmp/got-test-cherrypick_symlink_conflicts-Jv2WWaeI/stdout 2021-09-23 09:01:16.055542358 +0200 @@ -1,11 +1 @@ C alpha.link -C epsilon/beta.link -? boo.link -C epsilon.link -C dotgotbar.link -C dotgotfoo.link -D nonexistent.link -! zeta.link -C new.link -Merged commit c7e7b2e6d44dc944f734b2bbd402020d2d5cd20a -Files with new merge conflicts: 6 test failed; leaving test data in /tmp/got-test-cherrypick_symlink_conflicts-Jv2WWaeI ./backout.sh -q -r "/tmp" ./rebase.sh -q -r "/tmp" ./import.sh -q -r "/tmp" --- /tmp/got-test-import_basic-Eq08Yp0g/stdout.expected 2021-09-23 09:01:19.178559740 +0200 +++ /tmp/got-test-import_basic-Eq08Yp0g/stdout 2021-09-23 09:01:19.174559718 +0200 @@ -1,5 +1,5 @@ -A /tmp/got-test-import_basic-Eq08Yp0g/tree/gamma/delta A /tmp/got-test-import_basic-Eq08Yp0g/tree/epsilon/zeta +A /tmp/got-test-import_basic-Eq08Yp0g/tree/gamma/delta A /tmp/got-test-import_basic-Eq08Yp0g/tree/alpha A /tmp/got-test-import_basic-Eq08Yp0g/tree/beta Created branch refs/heads/main with commit d9f8f21af71a72ca781a3edce5e178ef39984882 test failed; leaving test data in /tmp/got-test-import_basic-Eq08Yp0g ./histedit.sh -q -r "/tmp" ./integrate.sh -q -r "/tmp" ./stage.sh -q -r "/tmp" --- /tmp/got-test-stage_patch-QVQba0G2/stdout.expected 2021-09-23 09:01:25.193593219 +0200 +++ /tmp/got-test-stage_patch-QVQba0G2/stdout 2021-09-23 09:01:25.180593147 +0200 @@ -1,34 +0,0 @@ ------------------------------------------------ -@@ -1,5 +1,5 @@ - 1 --2 -+a - 3 - 4 - 5 ------------------------------------------------ -M numbers (change 1 of 3) -stage this change? [y/n/q] n ------------------------------------------------ -@@ -4,7 +4,7 @@ - 4 - 5 - 6 --7 -+b - 8 - 9 - 10 ------------------------------------------------ -M numbers (change 2 of 3) -stage this change? [y/n/q] n ------------------------------------------------ -@@ -13,4 +13,4 @@ - 13 - 14 - 15 --16 -+c ------------------------------------------------ -M numbers (change 3 of 3) -stage this change? [y/n/q] n test failed; leaving test data in /tmp/got-test-stage_patch-QVQba0G2 --- /tmp/got-test-stage_patch_twice-XdKna4Bl/stdout.expected 2021-09-23 09:01:25.270593648 +0200 +++ /tmp/got-test-stage_patch_twice-XdKna4Bl/stdout 2021-09-23 09:01:25.256593570 +0200 @@ -1,34 +0,0 @@ ------------------------------------------------ -@@ -1,5 +1,5 @@ - 1 --2 -+a - 3 - 4 - 5 ------------------------------------------------ -M numbers (change 1 of 3) -stage this change? [y/n/q] n ------------------------------------------------ -@@ -4,7 +4,7 @@ - 4 - 5 - 6 --7 -+b - 8 - 9 - 10 ------------------------------------------------ -M numbers (change 2 of 3) -stage this change? [y/n/q] y ------------------------------------------------ -@@ -13,4 +13,4 @@ - 13 - 14 - 15 --16 -+c ------------------------------------------------ -M numbers (change 3 of 3) -stage this change? [y/n/q] n test failed; leaving test data in /tmp/got-test-stage_patch_twice-XdKna4Bl --- /tmp/got-test-stage_patch_quit-7tesL6Qk/stdout.expected 2021-09-23 09:01:25.749596314 +0200 +++ /tmp/got-test-stage_patch_quit-7tesL6Qk/stdout 2021-09-23 09:01:25.747596303 +0200 @@ -1,26 +1,2 @@ ------------------------------------------------ -@@ -1,5 +1,5 @@ - 1 --2 -+a - 3 - 4 - 5 ------------------------------------------------ -M numbers (change 1 of 3) -stage this change? [y/n/q] y ------------------------------------------------ -@@ -4,7 +4,7 @@ - 4 - 5 - 6 --7 -+b - 8 - 9 - 10 ------------------------------------------------ -M numbers (change 2 of 3) -stage this change? [y/n/q] q D zzz -stage this deletion? [y/n] n +stage this deletion? [y/n] y test failed; leaving test data in /tmp/got-test-stage_patch_quit-7tesL6Qk --- /tmp/got-test-stage_incomplete_script-Pprvtteo/stderr.expected 2021-09-23 09:01:25.824596731 +0200 +++ /tmp/got-test-stage_incomplete_script-Pprvtteo/stderr 2021-09-23 09:01:25.823596726 +0200 @@ -1 +1 @@ -got: invalid patch choice +got: no changes to stage test failed; leaving test data in /tmp/got-test-stage_incomplete_script-Pprvtteo ./unstage.sh -q -r "/tmp" test failed; leaving test data in /tmp/got-test-unstage_patch-mgkCln68 --- /tmp/got-test-unstage_patch_quit-bfrycmyJ/stdout.expected 2021-09-23 09:01:27.364605303 +0200 +++ /tmp/got-test-unstage_patch_quit-bfrycmyJ/stdout 2021-09-23 09:01:27.362605292 +0200 @@ -1,27 +1,3 @@ ------------------------------------------------ -@@ -1,5 +1,5 @@ - 1 --2 -+a - 3 - 4 - 5 ------------------------------------------------ -M numbers (change 1 of 3) -unstage this change? [y/n/q] y ------------------------------------------------ -@@ -4,7 +4,7 @@ - 4 - 5 - 6 --7 -+b - 8 - 9 - 10 ------------------------------------------------ -M numbers (change 2 of 3) -unstage this change? [y/n/q] q -G numbers D zzz -unstage this deletion? [y/n] n +unstage this deletion? [y/n] y +D zzz test failed; leaving test data in /tmp/got-test-unstage_patch_quit-bfrycmyJ ./cat.sh -q -r "/tmp" ./clone.sh -q -r "/tmp" test failed; leaving test data in /tmp/got-test-clone_basic-ALUcGjak test failed; leaving test data in /tmp/got-test-clone_list-cD8LDeq9 test failed; leaving test data in /tmp/got-test-clone_branch-9Ugp0WIY test failed; leaving test data in /tmp/got-test-clone_all-NBwBZOgC test failed; leaving test data in /tmp/got-test-clone_mirror-kt7Uu7uL test failed; leaving test data in /tmp/got-test-clone_mirror_all-9TKUv5gf test failed; leaving test data in /tmp/got-test-clone_reference-m4qns2XZ test failed; leaving test data in /tmp/got-test-clone_reference-CLKVFBdo test failed; leaving test data in /tmp/got-test-clone_reference_mirror-zlwun1kP test failed; leaving test data in /tmp/got-test-clone_multiple_branches-2fnJ4Gya make[1]: Leaving directory '/home/op/got-portable/regress/cmdline'