jj-failure.txt

        PASS [   0.013s] jj-lib::test_view test_merge_views_branches
        PASS [   0.013s] jj-lib::test_view test_merge_views_checkout
        PASS [   0.014s] jj-lib::test_view test_merge_views_child_on_abandoned::abandon_first
        PASS [   0.014s] jj-lib::test_view test_merge_views_child_on_abandoned::add_child_first
        PASS [   0.015s] jj-lib::test_view test_merge_views_child_on_rewritten::add_child_first
        PASS [   0.015s] jj-lib::test_view test_merge_views_child_on_rewritten::rewrite_first
        PASS [   0.015s] jj-lib::test_view test_merge_views_child_on_rewritten_divergent::add_child_on_rewritten_add_child_first
        PASS [   0.015s] jj-lib::test_view test_merge_views_child_on_rewritten_divergent::add_child_on_rewritten_rewrite_first
        PASS [   0.017s] jj-lib::test_view test_merge_views_child_on_rewritten_divergent::add_child_on_unchanged_add_child_first
        PASS [   0.015s] jj-lib::test_view test_merge_views_child_on_rewritten_divergent::add_child_on_unchanged_rewrite_first
        PASS [   0.015s] jj-lib::test_view test_merge_views_divergent
        FAIL [   0.014s] jj-lib::test_view test_merge_views_git_heads

--- STDOUT:              jj-lib::test_view test_merge_views_git_heads ---

running 1 test
test test_merge_views_git_heads ... FAILED

failures:

failures:
    test_merge_views_git_heads

test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 20 filtered out; finished in 0.01s


--- STDERR:              jj-lib::test_view test_merge_views_git_heads ---
thread 'test_merge_views_git_heads' panicked at 'assertion failed: `(left == right)`
  left: `Some(Conflict { removes: [CommitId("37ab480b927de44c05339e615c1f5af551f889598ab25668f27c58e90005ccc4d50f9724da5f5d548b3c3da7b6f08cc34c880fc0e43f876b2d1cefe9edbc3b21")], adds: [CommitId("f8a9c9af501bc19f6cb5c3a2de3158f41096b6e4883b465a8f34ef2f74b8885555861ec058224d027473ee912f34125e756e175faa22f3b6a26b7046a3010079"), CommitId("f2c7e40df8412fbcc8be0248b2469237ed4857b36d7dd15dd50cdd3c230ab1657d3c591c1f7c2adf630d083f2760499f057ed076c1821f91e335d1d6c24188ac")] })`,
 right: `Some(Conflict { removes: [CommitId("37ab480b927de44c05339e615c1f5af551f889598ab25668f27c58e90005ccc4d50f9724da5f5d548b3c3da7b6f08cc34c880fc0e43f876b2d1cefe9edbc3b21")], adds: [CommitId("f2c7e40df8412fbcc8be0248b2469237ed4857b36d7dd15dd50cdd3c230ab1657d3c591c1f7c2adf630d083f2760499f057ed076c1821f91e335d1d6c24188ac"), CommitId("f8a9c9af501bc19f6cb5c3a2de3158f41096b6e4883b465a8f34ef2f74b8885555861ec058224d027473ee912f34125e756e175faa22f3b6a26b7046a3010079")] })`', lib/tests/test_view.rs:465:5
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

   Canceling due to test failure: 3 tests still running
        FAIL [   0.015s] jj-lib::test_view test_merge_views_git_refs

--- STDOUT:              jj-lib::test_view test_merge_views_git_refs ---

running 1 test
test test_merge_views_git_refs ... FAILED

failures:

failures:
    test_merge_views_git_refs

test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 20 filtered out; finished in 0.01s


--- STDERR:              jj-lib::test_view test_merge_views_git_refs ---
thread 'test_merge_views_git_refs' panicked at 'assertion failed: `(left == right)`
  left: `{"refs/heads/feature": Normal(CommitId("5fdc64d559918ae6b6b6a39e846cef89fbca865a6921a56a679852c35c974c299d0b5c5850acea3b91990850073fa5f7f2c24720558cfbb0fc186912590ce5b1")), "refs/heads/main": Conflict { removes: [CommitId("ec8539472af532b363155a5bde87cebeb6760803e3259b3be9ff9915689298c02d5b72cc7e9e734bfa02aa05850b9f2877389888429372573b21655416ddbf6f")], adds: [CommitId("5ac5593b768278f97cb0e58060c77487c0619b5d5934296d0499dfccd8e870328df8bf136f577a25a5f0d842165bd929b1bb834318b0f8c211d275966916df1c"), CommitId("5d0e50cc9202849cbc4c128fb3abcbf1cc19b54ac8241c68142ebf5d113b0d267eeb4838b5833a1961708cd489ad17ee7d6ae5e8933559e891f7c3e6078abf19")] }}`,
 right: `{"refs/heads/feature": Normal(CommitId("5fdc64d559918ae6b6b6a39e846cef89fbca865a6921a56a679852c35c974c299d0b5c5850acea3b91990850073fa5f7f2c24720558cfbb0fc186912590ce5b1")), "refs/heads/main": Conflict { removes: [CommitId("ec8539472af532b363155a5bde87cebeb6760803e3259b3be9ff9915689298c02d5b72cc7e9e734bfa02aa05850b9f2877389888429372573b21655416ddbf6f")], adds: [CommitId("5d0e50cc9202849cbc4c128fb3abcbf1cc19b54ac8241c68142ebf5d113b0d267eeb4838b5833a1961708cd489ad17ee7d6ae5e8933559e891f7c3e6078abf19"), CommitId("5ac5593b768278f97cb0e58060c77487c0619b5d5934296d0499dfccd8e870328df8bf136f577a25a5f0d842165bd929b1bb834318b0f8c211d275966916df1c")] }}`', lib/tests/test_view.rs:425:5
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

        PASS [   0.014s] jj-lib::test_view test_merge_views_tags
        PASS [   0.014s] jj-lib::test_working_copy test_checkout_discard
        PASS [   0.016s] jj-lib::test_view test_merge_views_heads
------------
     Summary [   1.963s] 579/610 tests run: 577 passed, 2 failed, 0 skipped
        FAIL [   0.014s] jj-lib::test_view test_merge_views_git_heads
        FAIL [   0.015s] jj-lib::test_view test_merge_views_git_refs
error: test run failed