Merge lp://staging/~jelmer/brz/smart-1 into lp://staging/brz

The attempt to merge lp:~jelmer/brz/smart-1 into lp:brz failed. Command exited with 2.
Below is the output from the failed tests.

... OUTPUT TRIMMED ...

       Fresh gettext-sys v0.21.3
       Fresh unicode-normalization v0.1.22
       Fresh memoffset v0.8.0
       Fresh parking_lot v0.12.1
       Fresh log v0.4.17
       Fresh rand v0.8.5
       Fresh dirs v5.0.1
       Fresh locale_config v0.3.0
       Fresh num_cpus v1.15.0
       Fresh encoding_rs v0.8.32
       Fresh path-clean v1.0.1
       Fresh unindent v0.1.11
       Fresh indoc v1.0.9
       Fresh whoami v1.4.0
       Fresh gettext-rs v0.7.0
       Fresh breezy-osutils v3.3.3 (/tmp/tarmac/branch.cylrog6i/crates/osutils)
warning: use of deprecated associated function `chrono::TimeZone::timestamp`: use `timestamp_opt()` instead
 --> crates/osutils/src/time.rs:7:43
  |
7 | let local_time: DateTime<Local> = Utc.timestamp(timestamp, 0).with_timezone(&Local);
  | ^^^^^^^^^
  |
  = note: `#[warn(deprecated)]` on by default

warning: use of deprecated associated function `chrono::TimeZone::timestamp`: use `timestamp_opt()` instead
 --> crates/osutils/src/time.rs:8:39
  |
8 | let utc_time: DateTime<Utc> = Utc.timestamp(timestamp, 0);
  | ^^^^^^^^^

warning: use of deprecated associated function `chrono::TimeZone::timestamp`: use `timestamp_opt()` instead
   --> crates/osutils/src/time.rs:117:18
    |
117 | let dt = Utc.timestamp(t + offset, 0);
    | ^^^^^^^^^

warning: use of deprecated associated function `chrono::NaiveDateTime::from_timestamp`: use `from_timestamp_opt()` instead
   --> crates/osutils/src/time.rs:133:47
    |
133 | DateTime::from_utc(NaiveDateTime::from_timestamp(t, 0), Utc),
    | ^^^^^^^^^^^^^^

warning: use of deprecated associated function `chrono::NaiveDateTime::from_timestamp`: use `from_timestamp_opt()` instead
   --> crates/osutils/src/time.rs:151:51
    |
151 | DateTime::from_utc(NaiveDateTime::from_timestamp(t + offset, 0), Utc),
    | ^^^^^^^^^^^^^^

warning: use of deprecated associated function `chrono::TimeZone::timestamp`: use `timestamp_opt()` instead
   --> crates/osutils/src/time.rs:156:31
    |
156 | let local = Local.timestamp(t, 0);
    | ^^^^^^^^^

warning: use of deprecated associated function `chrono::TimeZone::timestamp`: use `timestamp_opt()` instead
   --> crates/osutils/src/time.rs:245:27
    |
245 | let system_time = Utc.timestamp(when as i64, 0);
    | ^^^^^^^^^

warning: unused import: `std::io::Write`
 --> crates/osutils/src/lib.rs:5:5
  |
5 | use std::io::Write;
  | ^^^^^^^^^^^^^^
  |
  = note: `#[warn(unused_imports)]` on by default

warning: `breezy-osutils` (lib) generated 8 warnings
     Running `rustc --crate-name pyo3_build_config --edition=2018 /root/.cargo/registry/src/github.com-1ecc6299db9ec823/pyo3-build-config-0.18.3/src/lib.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type l...

The attempt to merge lp:~jelmer/brz/smart-1 into lp:brz failed. Command exited with 1.
Below is the output from the failed tests.

... OUTPUT TRIMMED ...

breezy.plugins.fastimport.tests.test_generic_processor.TestImportToPackDeleteRenameThenModify.test_delete_rename_then_modify_symlink_in_root(1.9-rich-root) OK 240ms
breezy.plugins.fastimport.tests.test_generic_processor.TestImportToPackDeleteRenameThenModify.test_delete_rename_then_modify_symlink_in_root(2a) OK 55ms
breezy.plugins.fastimport.tests.test_generic_processor.TestImportToPackDeleteRenameThenModify.test_delete_rename_then_modify_symlink_in_subdir(pack-0.92) OK 241ms
breezy.plugins.fastimport.tests.test_generic_processor.TestImportToPackDeleteRenameThenModify.test_delete_rename_then_modify_symlink_in_subdir(1.9-rich-root) OK 242ms
breezy.plugins.fastimport.tests.test_generic_processor.TestImportToPackDeleteRenameThenModify.test_delete_rename_then_modify_symlink_in_subdir(2a) OK 58ms
breezy.plugins.fastimport.tests.test_generic_processor.TestImportToPackDeleteThenAdd.test_delete_then_add_file_in_root(pack-0.92) OK 236ms
breezy.plugins.fastimport.tests.test_generic_processor.TestImportToPackDeleteThenAdd.test_delete_then_add_file_in_root(1.9-rich-root) OK 241ms
breezy.plugins.fastimport.tests.test_generic_processor.TestImportToPackDeleteThenAdd.test_delete_then_add_file_in_root(2a) OK 58ms
breezy.plugins.fastimport.tests.test_generic_processor.TestImportToPackDeleteThenAdd.test_delete_then_add_file_in_subdir(pack-0.92) OK 240ms
breezy.plugins.fastimport.tests.test_generic_processor.TestImportToPackDeleteThenAdd.test_delete_then_add_file_in_subdir(1.9-rich-root) OK 241ms
breezy.plugins.fastimport.tests.test_generic_processor.TestImportToPackDeleteThenAdd.test_delete_then_add_file_in_subdir(2a) OK 55ms
breezy.plugins.fastimport.tests.test_generic_processor.TestImportToPackDeleteThenAdd.test_delete_then_add_symlink_in_root(pack-0.92) OK 234ms
breezy.plugins.fastimport.tests.test_generic_processor.TestImportToPackDeleteThenAdd.test_delete_then_add_symlink_in_root(1.9-rich-root) OK 235ms
breezy.plugins.fastimport.tests.test_generic_processor.TestImportToPackDeleteThenAdd.test_delete_then_add_symlink_in_root(2a) OK 51ms
breezy.plugins.fastimport.tests.test_generic_processor.TestImportToPackDeleteThenAdd.test_delete_then_add_symlink_in_subdir(pack-0.92) OK 237ms
breezy.plugins.fastimport.tests.test_generic_processor.TestImportToPackDeleteThenAdd.test_delete_then_add_symlink_in_subdir(1.9-rich-root) OK 242ms
breezy.plugins.fastimport.tests.test_generic_processor.TestImportToPackDeleteThenAdd.test_delete_then_add_symlink_in_subdir(2a) OK 54ms
breezy.plugins.fastimport.tests.test_generic_processor.TestImportToPackFileKinds.test_import_plainfile(pack-0.92) OK 224ms
breezy.plugins.fastimport.tests.test_generic_processor.TestImportToPackFileKinds.test_import_plainfile(1.9-rich-root) OK 228ms
breezy.plugins.fastimport.tests.test_generic_processor.TestImportToPackFileKinds.test_import_plainfile(2a) OK 43ms
breezy.plugins.fastimport.tests.test_generi...

The attempt to merge lp:~jelmer/brz/smart-1 into lp:brz failed. (``verify_command_output_timeout``) Command sent no output for 1800 seconds.
Below is the output from the failed tests.

... OUTPUT TRIMMED ...

test_merge.TestMergeInto.test_only_file OK 268ms
test_merge.TestMergeInto.test_only_subdir OK 265ms
test_merge.TestMergeInto.test_subdir OK 242ms
test_merge.TestMergerEntriesLCA.test_both_sides_revert OK 98ms
test_merge.TestMergerEntriesLCA.test_different_lca_resolve_one_side_updates_content OK 116ms
test_merge.TestMergerEntriesLCA.test_file_not_in_one_lca OK 90ms
test_merge.TestMergerEntriesLCA.test_interesting_file_in_base OK 111ms
test_merge.TestMergerEntriesLCA.test_interesting_file_in_lca OK 98ms
test_merge.TestMergerEntriesLCA.test_interesting_file_in_this OK 104ms
test_merge.TestMergerEntriesLCA.test_interesting_files OK 97ms
test_merge.TestMergerEntriesLCA.test_kind_changed OK 89ms
test_merge.TestMergerEntriesLCA.test_not_in_base OK 136ms
test_merge.TestMergerEntriesLCA.test_not_in_other OK 90ms
test_merge.TestMergerEntriesLCA.test_not_in_other_mod_in_lca1_not_in_lca2 OK 93ms
test_merge.TestMergerEntriesLCA.test_not_in_other_or_lca OK 97ms
test_merge.TestMergerEntriesLCA.test_not_in_this OK 93ms
test_merge.TestMergerEntriesLCA.test_one_lca_accidentally_prunedXFAIL 137ms
    reason: {{{We prune values from BASE even when relevant.}}}

AssertionError: not equal:
a = [(b'foo-id',
  False,
  ((b'a-root-id', [b'a-root-id', b'a-root-id']), b'a-root-id', b'a-root-id'),
  (('foo', ['bar', 'foo']), 'bar', 'bing'),
  ((False, [False, False]), False, False),
  False)]
b = []

test_merge.TestMergerEntriesLCA.test_one_lca_supersedes OK 126ms
test_merge.TestMergerEntriesLCA.test_one_lca_supersedes_pathXFAIL 139ms
    reason: {{{We don't do an actual heads() check on lca values, or use the per-attribute graph}}}

AssertionError: not equal:
a = []
b = [(b'foo-id',
  False,
  (('foo', ['bar', 'bing']), 'barry', 'bing'),
  ((b'a-root-id', [b'a-root-id', b'a-root-id']), b'a-root-id', b'a-root-id'),
  (('foo', ['bar', 'bing']), 'barry', 'bing'),
  ((False, [False, False]), False, False),
  False)]

test_merge.TestMergerEntriesLCA.test_only_in_one_lca OK 90ms
test_merge.TestMergerEntriesLCA.test_only_in_other OK 86ms
test_merge.TestMergerEntriesLCA.test_only_path_changed OK 92ms
test_merge.TestMergerEntriesLCA.test_same_lca_resolution_one_side_updates_contentXFAIL 113ms
    reason: {{{We don't detect that LCA resolution was the same on both sides}}}

AssertionError: not equal:
a = []
b = [(b'foo-id',
  True,
  (('foo', ['foo', 'foo']), 'foo', 'foo'),
  ((b'a-root-id', [b'a-root-id', b'a-root-id']), b'a-root-id', b'a-root-id'),
  (('foo', ['foo', 'foo']), 'foo', 'foo'),
  ((False, [False, False]), False, False),
  False)]

test_merge.TestMergerEntriesLCA.test_simple OK 97ms
test_merge.TestMergerEntriesLCA.test_this_changed_kind OK 87ms
test_merge.TestMergerEntriesLCAOnDisk.test_all_wt OK 772ms
test_merge.TestMergerEntriesLCAOnDisk.test_both_sides_revert OK ...

Attempt to merge into lp:brz failed due to conflicts:

text conflict in breezy/bzr/smart/medium.py
text conflict in breezy/bzr/smart/protocol.py