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" ./status.sh -q -r "/tmp" On branch master nothing to commit, working tree clean --- /tmp/got-test-status_shows_no_mods_after_complete_merge-9eSe4088/stdout.expected 2021-09-23 08:55:52.438663670 +0200 +++ /tmp/got-test-status_shows_no_mods_after_complete_merge-9eSe4088/stdout 2021-09-23 08:55:52.480663921 +0200 @@ -1,2 +1 @@ -G numbers -Updated to refs/heads/master: 09dcc80e1b1fb9014f13b46f8807e50db795b7db +Already up-to-date test failed; leaving test data in /tmp/got-test-status_shows_no_mods_after_complete_merge-9eSe4088 ./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-Lrr28OSf/stdout.expected 2021-09-23 08:55:58.463699614 +0200 +++ /tmp/got-test-blame_all_lines_replaced-Lrr28OSf/stdout 2021-09-23 08:55:58.443699494 +0200 @@ -1,8 +0,0 @@ -1) b811a7be 2021-09-23 flan_hac 1 -2) b811a7be 2021-09-23 flan_hac 2 -3) b811a7be 2021-09-23 flan_hac 3 -4) b811a7be 2021-09-23 flan_hac 4 -5) b811a7be 2021-09-23 flan_hac 5 -6) b811a7be 2021-09-23 flan_hac 6 -7) b811a7be 2021-09-23 flan_hac 7 -8) b811a7be 2021-09-23 flan_hac 8 test failed; leaving test data in /tmp/got-test-blame_all_lines_replaced-Lrr28OSf --- /tmp/got-test-blame_lines_shifted_up-dneRvl2u/stdout.expected 2021-09-23 08:55:58.591700377 +0200 +++ /tmp/got-test-blame_lines_shifted_up-dneRvl2u/stdout 2021-09-23 08:55:58.589700365 +0200 @@ -1,8 +1,3 @@ -1) b811a7be 2021-09-23 flan_hac 1 -2) b811a7be 2021-09-23 flan_hac 2 -3) b76a630b 2021-09-23 flan_hac foo -4) b76a630b 2021-09-23 flan_hac bar -5) b76a630b 2021-09-23 flan_hac baz -6) b811a7be 2021-09-23 flan_hac 6 -7) b811a7be 2021-09-23 flan_hac 7 -8) b811a7be 2021-09-23 flan_hac 8 +1) b76a630b 2021-09-23 flan_hac foo +2) b76a630b 2021-09-23 flan_hac bar +3) b76a630b 2021-09-23 flan_hac baz test failed; leaving test data in /tmp/got-test-blame_lines_shifted_up-dneRvl2u --- /tmp/got-test-blame_lines_shifted_down-EaqmRisS/stdout.expected 2021-09-23 08:55:58.723701165 +0200 +++ /tmp/got-test-blame_lines_shifted_down-EaqmRisS/stdout 2021-09-23 08:55:58.722701159 +0200 @@ -1,11 +1,3 @@ -01) b811a7be 2021-09-23 flan_hac 1 -02) b811a7be 2021-09-23 flan_hac 2 -03) b76a630b 2021-09-23 flan_hac foo -04) b76a630b 2021-09-23 flan_hac bar -05) b76a630b 2021-09-23 flan_hac baz -06) b811a7be 2021-09-23 flan_hac 3 -07) b811a7be 2021-09-23 flan_hac 4 -08) b811a7be 2021-09-23 flan_hac 5 -09) b811a7be 2021-09-23 flan_hac 6 -10) b811a7be 2021-09-23 flan_hac 7 -11) b76a630b 2021-09-23 flan_hac 8 +1) b76a630b 2021-09-23 flan_hac foo +2) b76a630b 2021-09-23 flan_hac bar +3) b76a630b 2021-09-23 flan_hac baz test failed; leaving test data in /tmp/got-test-blame_lines_shifted_down-EaqmRisS ./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-Ju81pLFc/stdout.expected 2021-09-23 08:56:05.076739065 +0200 +++ /tmp/got-test-revert_patch-Ju81pLFc/stdout 2021-09-23 08:56:05.064738994 +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-Ju81pLFc --- /tmp/got-test-revert_patch_one_change-GWK3o66G/stdout.expected 2021-09-23 08:56:05.418741106 +0200 +++ /tmp/got-test-revert_patch_one_change-GWK3o66G/stdout 2021-09-23 08:56:05.405741028 +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-GWK3o66G ./cherrypick.sh -q -r "/tmp" ./backout.sh -q -r "/tmp" ./rebase.sh -q -r "/tmp" ./import.sh -q -r "/tmp" --- /tmp/got-test-import_basic-gKLS21HF/stdout.expected 2021-09-23 08:56:10.131769222 +0200 +++ /tmp/got-test-import_basic-gKLS21HF/stdout 2021-09-23 08:56:10.128769205 +0200 @@ -1,5 +1,5 @@ -A /tmp/got-test-import_basic-gKLS21HF/tree/gamma/delta A /tmp/got-test-import_basic-gKLS21HF/tree/epsilon/zeta +A /tmp/got-test-import_basic-gKLS21HF/tree/gamma/delta A /tmp/got-test-import_basic-gKLS21HF/tree/alpha A /tmp/got-test-import_basic-gKLS21HF/tree/beta Created branch refs/heads/main with commit ce2a4cd5c379ed47ce030ec34681c1ed2e349b0a test failed; leaving test data in /tmp/got-test-import_basic-gKLS21HF ./histedit.sh -q -r "/tmp" ./integrate.sh -q -r "/tmp" ./stage.sh -q -r "/tmp" --- /tmp/got-test-stage_patch-BSWyOGE0/stdout.expected 2021-09-23 08:56:16.099804826 +0200 +++ /tmp/got-test-stage_patch-BSWyOGE0/stdout 2021-09-23 08:56:16.087804754 +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-BSWyOGE0 --- /tmp/got-test-stage_patch_twice-BsykdfRn/stdout.expected 2021-09-23 08:56:16.166805226 +0200 +++ /tmp/got-test-stage_patch_twice-BsykdfRn/stdout 2021-09-23 08:56:16.154805154 +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-BsykdfRn --- /tmp/got-test-stage_patch_quit-J0juWz57/stdout.expected 2021-09-23 08:56:16.600807815 +0200 +++ /tmp/got-test-stage_patch_quit-J0juWz57/stdout 2021-09-23 08:56:16.598807803 +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-J0juWz57 --- /tmp/got-test-stage_incomplete_script-HVP5w0t7/stderr.expected 2021-09-23 08:56:16.665808203 +0200 +++ /tmp/got-test-stage_incomplete_script-HVP5w0t7/stderr 2021-09-23 08:56:16.663808191 +0200 @@ -1 +1 @@ -got: invalid patch choice +got: no changes to stage test failed; leaving test data in /tmp/got-test-stage_incomplete_script-HVP5w0t7 ./unstage.sh -q -r "/tmp" test failed; leaving test data in /tmp/got-test-unstage_patch-AbHi9Neh --- /tmp/got-test-unstage_patch_quit-OjUHD79o/stdout.expected 2021-09-23 08:56:17.960815928 +0200 +++ /tmp/got-test-unstage_patch_quit-OjUHD79o/stdout 2021-09-23 08:56:17.958815916 +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-OjUHD79o ./cat.sh -q -r "/tmp" ./clone.sh -q -r "/tmp" ./fetch.sh -q -r "/tmp" ./tree.sh -q -r "/tmp" ./pack.sh -q -r "/tmp" ./cleanup.sh -q -r "/tmp" make[1]: Leaving directory '/home/op/got-portable/regress/cmdline'