Rebase of binary file failed

NEW
Unassigned

Status

MozReview
Autoland
3 months ago
3 months ago

People

(Reporter: gps, Unassigned)

Tracking

Details

(Reporter)

Description

3 months ago
Over in bug 1350277 we saw autoland fail apparently due to a failed rebase of a binary file!

> We're sorry, Autoland could not rebase your commits for you automatically.
> Please manually rebase your commits and try again.
> 
> hg error in cmd: hg rebase -s cd4094992fe5 -d 9219c2f933e2: rebasing
> 419919:cd4094992fe5 "Bug 1350277 remove duplicates when showing host
> permissons r=aswan" (tip)
> merging
> browser/base/content/test/webextensions/browser_webext_permissions.xpi
> merging toolkit/components/extensions/Extension.jsm
> warning:
> /repos/mozreview-gecko/browser/base/content/test/webextensions/
> browser_webext_permissions.xpi looks like a binary file.
> warning: conflicts while merging
> browser/base/content/test/webextensions/browser_webext_permissions.xpi!
> (edit, then use 'hg resolve --mark')
> unresolved conflicts (see hg resolve, then hg rebase --continue)

Not sure what's going on here. It has the odor of an upstream Mercurial bug.
You need to log in before you can comment on or make changes to this bug.