Merge lp://staging/~jelmer/brz/help into lp://staging/brz

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

... OUTPUT TRIMMED ...

   --> crates/bazaar/src/inventory_delta.rs:210:42
    |
210 | vec![&b"version: "[..], new_name.bytes(), &b"\n"[..]].concat(),
    | ^^^^^

warning: use of deprecated associated function `FileId::bytes`
   --> crates/bazaar/src/inventory_delta.rs:295:37
    |
295 | .map_or(&b""[..], |x| x.bytes());
    | ^^^^^

warning: use of deprecated associated function `FileId::bytes`
   --> crates/bazaar/src/inventory_delta.rs:328:28
    |
328 | delta_item.file_id.bytes(),
    | ^^^^^

warning: use of deprecated associated function `RevisionId::bytes`
   --> crates/bazaar/src/inventory_delta.rs:330:23
    |
330 | last_modified.bytes(),
    | ^^^^^

warning: use of deprecated associated function `chrono::NaiveDateTime::from_timestamp`: use `from_timestamp_opt()` instead
  --> crates/bazaar/src/revision.rs:50:24
   |
50 | NaiveDateTime::from_timestamp(self.timestamp as i64, 0)
   | ^^^^^^^^^^^^^^

warning: use of deprecated associated function `chrono::FixedOffset::east`: use `east_opt()` instead
  --> crates/bazaar/src/revision.rs:54:48
   |
54 | self.timezone.map(chrono::FixedOffset::east)
   | ^^^^

warning: use of deprecated associated function `RevisionId::bytes`
   --> crates/bazaar/src/xml_serializer.rs:269:57
    |
269 | encode_and_escape_bytes(rev.revision_id.bytes()),
    | ^^^^^

warning: use of deprecated associated function `RevisionId::bytes`
   --> crates/bazaar/src/xml_serializer.rs:293:59
    |
293 | encode_and_escape_bytes(parent_id.bytes())
    | ^^^^^

warning: constant `BENCODE_REVISION_SERIALIZER_V1` is never used
   --> crates/bazaar/src/bencode_serializer.rs:314:1
    |
314 | const BENCODE_REVISION_SERIALIZER_V1: BEncodeRevisionSerializer1 = BEncodeRevisionSerializer1 {};
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: `#[warn(dead_code)]` on by default

warning: function `surrogate_escape` is never used
   --> crates/bazaar/src/xml_serializer.rs:112:4
    |
112 | fn surrogate_escape(b: u8) -> Vec<u8> {
    | ^^^^^^^^^^^^^^^^

       Fresh inventory v0.3.6
       Fresh url v2.3.1
warning: `bazaar` (lib) generated 12 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 lib --emit=dep-info,metadata,link -C embed-bitcode=no -C debuginfo=2 --cfg 'feature="default"' --cfg 'feature="resolve-config"' -C metadata=02384f4e2b77e9cf -C extra-filename=-02384f4e2b77e9cf --out-dir /tmp/tarmac/branch.nj2uwkru/target/debug/d...