1252491 - [fxos-sunset] Update Pine repository to use custom gaia branch

Status: RESOLVED FIXED

(Firefox OS Graveyard :: Infrastructure, defect)

Comment 1

[Aus Lacroix [:aus]]

https://hg.mozilla.org/projects/pine/rev/a100bef689c810aff3096dfe597a47fe45d3bdff
Bug 1252491 - Update pine repository to use custom gaia branch. r=me XXX=DONOTMERGE

Comment 2

[Aus Lacroix [:aus]]

https://hg.mozilla.org/projects/pine/rev/a0f3d117aed137aef250c4d9e7bf36fc70d830fd
Bug 1252491 - Add empty 'git_revision' to respect dict requirements. r=me XXX=DONOTMERGE

Comment 3

[Aus Lacroix [:aus]]

https://hg.mozilla.org/projects/pine/rev/bccf8745c004a15ae303c8c0d2fad39327e223e2
Bug 1252491 - gaia.json dict also *requires* revision and repo_path even when they aren't used. r=me XXX=DONOTMERGE

Comment 4

[Aus Lacroix [:aus]]

Merged pine to kanikani -- https://github.com/mozilla-b2g/gaia/commit/e5f68b94eedca961ce70fba687af22a9186c4463

Comment 5

[Aus Lacroix [:aus]]

This now works as expected. Unfortunately, we need to bump the revision manually as we do not have bumper-bot support for branch to branch set-ups like this.

Also, it's easy for this setting to get overwritten when merging from m-c back to pine. Trying to figure out something better and leaving this bug open.

Comment 6

[Aus Lacroix [:aus]]

Alright guys, I'm going to say this is good enough. We will end up having to merge / resolve conflicts manually anyway so bumping to revision automatically is moot and easily done when the merge conflicts are resolved and all is ready to be pushed.

We'll be lucky to have the bumper bot come back up for b2g-inbound in time for our merge back :)