Landings for Stack Containing D163177

Successfully landed

Landing requested on , by ealvarez@mozilla.com.

Revisions: D163177 diff 661045

Result: https://hg.mozilla.org/integration/autoland/rev/7d0bd996b3f0b4376eb2b3bbe40da1a665b79df5

Failed to land

Landing requested on , by ealvarez@mozilla.com.

Revisions: D163177 diff 653856

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

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

editor/docs/IMEHandlingGuide.rst @ a5fb8075260f48fcd348d3b80b8ea594cc1e75d7

--- IMEHandlingGuide.rst
+++ IMEHandlingGuide.rst
...

--- IMEHandlingGuide.rst
+++ IMEHandlingGuide.rst
@@ -310,11 +310,11 @@
 * ``ui.IMEConvertedTextUnderline``
 * ``ui.IMESelectedConvertedTextBackground``
 * ``ui.IMESelectedConvertedTextForeground``
 * ``ui.IMESelectedConvertedTextUnderline``
 
-Underline style can be specified with the following prefs. The values are integer,  0: none, 1: dotted, 2: dashed, 3: solid, 4: double, 5: wavy (The values same as ``NS_STYLE_TEXT_DECORATION_STYLE_*`` defined in `nsStyleConsts.h <https://searchfox.org/mozilla-central/source/layout/style/nsStyleConsts.h>`__.
+Underline style can be specified with the following prefs. The values are integer,  0: none, 1: dotted, 2: dashed, 3: solid, 4: double, 5: wavy (The values same as ``mozilla::StyleTextDecorationStyle`` defined in `nsStyleConsts.h <https://searchfox.org/mozilla-central/source/layout/style/nsStyleConsts.h>`__.
 
 * ``ui.IMERawInputUnderlineStyle``
 * ``ui.IMESelectedRawTextUnderlineStyle``
 * ``ui.IMEConvertedTextUnderlineStyle``
 * ``ui.IMESelectedConvertedTextUnderlineStyle``

Raw error output:
Problem while applying patch in revision 163177:

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

patching file editor/docs/IMEHandlingGuide.rst
Hunk #1 FAILED at 309
1 out of 1 hunks FAILED -- saving rejects to file editor/docs/IMEHandlingGuide.rst.rej
abort: patch failed to apply

Failed to land

Landing requested on , by ealvarez@mozilla.com.

Revisions: D163177 diff 653856

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

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

editor/docs/IMEHandlingGuide.rst @ a5fb8075260f48fcd348d3b80b8ea594cc1e75d7

--- IMEHandlingGuide.rst
+++ IMEHandlingGuide.rst
...

--- IMEHandlingGuide.rst
+++ IMEHandlingGuide.rst
@@ -310,11 +310,11 @@
 * ``ui.IMEConvertedTextUnderline``
 * ``ui.IMESelectedConvertedTextBackground``
 * ``ui.IMESelectedConvertedTextForeground``
 * ``ui.IMESelectedConvertedTextUnderline``
 
-Underline style can be specified with the following prefs. The values are integer,  0: none, 1: dotted, 2: dashed, 3: solid, 4: double, 5: wavy (The values same as ``NS_STYLE_TEXT_DECORATION_STYLE_*`` defined in `nsStyleConsts.h <https://searchfox.org/mozilla-central/source/layout/style/nsStyleConsts.h>`__.
+Underline style can be specified with the following prefs. The values are integer,  0: none, 1: dotted, 2: dashed, 3: solid, 4: double, 5: wavy (The values same as ``mozilla::StyleTextDecorationStyle`` defined in `nsStyleConsts.h <https://searchfox.org/mozilla-central/source/layout/style/nsStyleConsts.h>`__.
 
 * ``ui.IMERawInputUnderlineStyle``
 * ``ui.IMESelectedRawTextUnderlineStyle``
 * ``ui.IMEConvertedTextUnderlineStyle``
 * ``ui.IMESelectedConvertedTextUnderlineStyle``

Raw error output:
Problem while applying patch in revision 163177:

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

patching file editor/docs/IMEHandlingGuide.rst
Hunk #1 FAILED at 309
1 out of 1 hunks FAILED -- saving rejects to file editor/docs/IMEHandlingGuide.rst.rej
abort: patch failed to apply

Stack containing revision D163177

Land		Bug	Status	Revision	Reviewers
		1802799	Blocked Repository is not supported by Lando. Closed	D163177: Bug 1802799 - [refactor] Migrate NS_STYLE_TEXT_DECORATION_STYLE_* defines r=emilio	@emilio accepted a prior diff @geckoview-reviewers accepted a prior diff @ohall accepted a prior diff