Landings for Stack Containing D206979

Failed to land

Landing requested on , by bdeankawamura@mozilla.com.

Revisions: D206130 diff 847245 D206131 diff 847246 D206979 diff 846821

While applying revision D206131 to mozilla-central, the following files had conflicts:

(Hint: try rebasing your changes on the latest commits from mozilla-central and re-submitting.)

  • .cargo/config.toml.in @ 70d079bfc95695ad97fe50f32b293760154e153c
  • --- config.toml.in
    +++ config.toml.in
    ...
    
    --- config.toml.in
    +++ config.toml.in
    @@ -88,13 +88,13 @@
     [source."git+https://github.com/mozilla/neqo?tag=v0.7.2"]
     git = "https://github.com/mozilla/neqo"
     tag = "v0.7.2"
     replace-with = "vendored-sources"
     
    -[source."git+https://github.com/mozilla/uniffi-rs.git?rev=afb29ebdc1d9edf15021b1c5332fc9f285bbe13b"]
    +[source."git+https://github.com/mozilla/uniffi-rs.git?rev=d52c5460ae42ecad1e73a5b394ac96d48f4769de"]
     git = "https://github.com/mozilla/uniffi-rs.git"
    -rev = "afb29ebdc1d9edf15021b1c5332fc9f285bbe13b"
    +rev = "d52c5460ae42ecad1e73a5b394ac96d48f4769de"
     replace-with = "vendored-sources"
     
     [source."git+https://github.com/seanmonstar/warp?rev=9d081461ae1167eb321585ce424f4fef6cf0092b"]
     git = "https://github.com/seanmonstar/warp"
     rev = "9d081461ae1167eb321585ce424f4fef6cf0092b"
    
Raw error output:
Problem while applying patch in revision 206131:

hg error in cmd: hg import --no-commit -s 95 /tmp/tmpsg1wlsk8: applying /tmp/tmpsg1wlsk8

patching file .cargo/config.toml.in
Hunk #2 FAILED at 87
1 out of 2 hunks FAILED -- saving rejects to file .cargo/config.toml.in.rej
abort: patch failed to apply
Failed to land

Landing requested on , by bdeankawamura@mozilla.com.

Revisions: D206130 diff 847089 D206131 diff 847090 D206979 diff 846821

While applying revision D206131 to mozilla-central, the following files had conflicts:

(Hint: try rebasing your changes on the latest commits from mozilla-central and re-submitting.)

  • .cargo/config.toml.in @ 70d079bfc95695ad97fe50f32b293760154e153c
  • --- config.toml.in
    +++ config.toml.in
    ...
    
    --- config.toml.in
    +++ config.toml.in
    @@ -88,13 +88,13 @@
     [source."git+https://github.com/mozilla/neqo?tag=v0.7.2"]
     git = "https://github.com/mozilla/neqo"
     tag = "v0.7.2"
     replace-with = "vendored-sources"
     
    -[source."git+https://github.com/mozilla/uniffi-rs.git?rev=afb29ebdc1d9edf15021b1c5332fc9f285bbe13b"]
    +[source."git+https://github.com/mozilla/uniffi-rs.git?rev=d52c5460ae42ecad1e73a5b394ac96d48f4769de"]
     git = "https://github.com/mozilla/uniffi-rs.git"
    -rev = "afb29ebdc1d9edf15021b1c5332fc9f285bbe13b"
    +rev = "d52c5460ae42ecad1e73a5b394ac96d48f4769de"
     replace-with = "vendored-sources"
     
     [source."git+https://github.com/seanmonstar/warp?rev=9d081461ae1167eb321585ce424f4fef6cf0092b"]
     git = "https://github.com/seanmonstar/warp"
     rev = "9d081461ae1167eb321585ce424f4fef6cf0092b"
    
Raw error output:
Problem while applying patch in revision 206131:

hg error in cmd: hg import --no-commit -s 95 /tmp/tmpigiub4oy: applying /tmp/tmpigiub4oy

patching file .cargo/config.toml.in
Hunk #2 FAILED at 87
1 out of 2 hunks FAILED -- saving rejects to file .cargo/config.toml.in.rej
abort: patch failed to apply

Stack containing revision D206979

Land Bug Status Revision Reviewers
1890476
Blocked
Repository is not supported by Lando.
Abandoned
D206979: Bug 1890476 - Update android nightly application-services version bump to 94d15144656f2fa49e3de385bb1ec07da446d6e4
  • @dmeehan accepted a prior diff