980113 - Need to standup merging of mozila/gecko-dev into adamroach/gecko-dev

Status: VERIFIED FIXED

(Hello (Loop) :: Client, defect)

Description

[Dan Mosedale (:dmosedale, :dmose)]

So that we actually have something that's mergable once we're ready to land.

Comment 1

[Dan Mosedale (:dmosedale, :dmose)]

Attachment: Ehsan's equivalent script for mercurial

Comment 2

[Maire Reavy [:mreavy]]

Assigning to Adam for now, I may reassign

Comment 3

[Mark Banner (:standard8)]

Attachment: Merge Commands

I've done this today using manual commands (easier, and you can check stuff in-between), we'll go forward with manual from here, as I think it'll be easier and we can control the noise.

I'm attaching the commands I used for later reference.

Comment 4

[Mark Banner (:standard8)]

I think we can close this now - we know what we're doing, any more we can just do as necessary.

Comment 5

[Dan Mosedale (:dmosedale, :dmose)]

Comment on attachment 8405387 [details]
Merge Commands

Awesome; thanks!

Comment 6

[u279076]

Assuming verified as this doesn't need QA -- please needinfo me to request testing.