1507643 - Mis-applied patch by Lando

Status: RESOLVED DUPLICATE of bug 1483966

(Conduit :: Lando, enhancement, P1)

Description

[Thomas Daede [:TD-Linux]]

In this bug:

https://bugzilla.mozilla.org/show_bug.cgi?id=1501796

I pushed the following Phabricator patch with Lando:

https://phabricator.services.mozilla.com/D10802

However, Lando misapplied it, without any warnings:

https://hg.mozilla.org/integration/autoland/rev/6357c007967a

Presumably Lando should be able to detect this better.

Comment 1

[Mark Côté [:mcote]]

I think this is bug 1483966.  It doesn't happen very often, but it's unfortunately rather difficult to fix.

Comment 2

[Mike Hommey [:glandium]]

(In reply to Mark Côté [:mcote] from comment #1)
> but it's unfortunately rather difficult to fix.

Could you detail here? The `patch` utility rightfully rejects the patch. What is lando doing?

Comment 3

[Mark Côté [:mcote]]

Lando is applying the diff directly.

Comment 4

[Mike Hommey [:glandium]]

Are you saying that lando reimplements patch, with inconvenients? why is it not using patch then?

Comment 5

[Mark Côté [:mcote]]

Oops sorry, I thought you said `arc patch`.  I'll have someone dig more into this.

Comment 6

[Steven MacLeod [:smacleod]]

This should be solved by applying to original parent and rebasing, rather than using hg import.