Closed
Bug 1400377
Opened 7 years ago
Closed 6 years ago
Rebase of binary file failed
Categories
(Conduit Graveyard :: Transplant, enhancement)
Conduit Graveyard
Transplant
Tracking
(Not tracked)
RESOLVED
WONTFIX
People
(Reporter: gps, Unassigned)
Details
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.
Updated•6 years ago
|
Product: MozReview → Conduit
Comment 1•6 years ago
|
||
MozReview is being decommissioned and this likely won't be an issue with Phabricator/Lando (at least not in this form).
Status: NEW → RESOLVED
Closed: 6 years ago
Resolution: --- → WONTFIX
Updated•8 days ago
|
Product: Conduit → Conduit Graveyard
You need to log in
before you can comment on or make changes to this bug.
Description
•