1224546 - Fix emulator branch names

Status: RESOLVED FIXED

(Firefox OS Graveyard :: Emulator, defect)

Description

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Some of the branches we pull for emulator have meaningless names ('b2g-emu', 'emu-fix'). We should clean up the naming.

Comment 1

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: Github pull request

I didn't change any of the branches. I just added them under new names. I left the old branches in place for now, so we can checkout older versions as well.

Comment 2

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Hi Juan,

can you please take a look at this pull request and the one in bug 1224613? Thanks!

Comment 3

[Juan Gomez [:_AtilA_] (CET/CEST)]

Comment on attachment 8687167 [details] [review]
Github pull request

Hi Thomas,
Sorry for the late review! I had an intense week at MTV :)
I see that you have renamed: b2g-4.0.4_r2.1-emu-fix to b2g-ics. Can we at least call it: b2g-4.0.4_r2.1 , so we don't loose information about what was the initial branch.

Comment 4

[Thomas Zimmermann [:tzimmermann] [:tdz]]

(In reply to Juan Gomez [:_AtilA_] (CEST) from comment #3)
> Comment on attachment 8687167 [details] [review]
> Github pull request
> 
> Hi Thomas,
> Sorry for the late review! I had an intense week at MTV :)

Oh, I see! :)

> I see that you have renamed: b2g-4.0.4_r2.1-emu-fix to b2g-ics. Can we at
> least call it: b2g-4.0.4_r2.1 , so we don't loose information about what was
> the initial branch.

I think the original name is a misnomer, because b2g-4.0.4_r2.1-emu-fix isn't actually based on 4.0.4_r2.1. The tag for 4.0.4_r2.1 is in it's history but ~100 commits away. So without a direct AOSP-based ancestor I called it 'b2g-ics'.

Comment 5

[Carsten Book [:Tomcat]]

https://github.com/mozilla-b2g/b2g-manifest/commit/4300fefcc890a8b8e1b0d85a6cc7ab192615ab46