891179 - Resolve v1.1.0hd merge conflicts found July 8, 2013

Status: RESOLVED FIXED

(Firefox OS Graveyard :: Gaia, defect)

Description

[John Ford [:jhford] CET/CEST Berlin Time]

I just tried to merge v1-train into v1.1.0hd.  There are a few merge conflicts and I am not the right person to resolve them.  Wayne or Evelyn, could one of you please resolve the merge.  When you've done so, we need to comment and set flags on all the bugs that are merged over to v1.1.0hd.  You can do that manually, or if you comment on this bug with the commit range of the merge, I can do that automatically (this is the v1.1.0hd abc123de..123f456ab line when you push).

# Unmerged paths:
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#	both modified:      apps/bluetooth/style/transfer.css
#	deleted by them:    apps/video/style/icons/60/[e-mail]
#	deleted by them:    apps/video/style/icons/[e-mail]
#	deleted by them:    apps/video/style/images/[e-mail]
#	both modified:      build/webapp-zip.js
#	both modified:      shared/style/switches.css

Comment 1

[Wayne Chang [:wchang]]

flagging Tim and Evelyn to help

Comment 2

[Evelyn Hung]

Rex is helping on this. Thanks.

Comment 3

[KM Lee [:rexboy] (inactivate after Sep. 22)]

WIP Tree:
https://github.com/rexboy7/gaia/commits/v1.1.0hd-wip2

I found there is a commit in v1-train called 'Revert "Merge branch 'v1.1.0hd' into v1-train"' that causes some problem when merging, so I just reverted it in the tree. I'll do some test and then push this tree back to v1.1.0hd.

Comment 4

[KM Lee [:rexboy] (inactivate after Sep. 22)]

Merged v1-train into v1.1.0hd until commit f1d2e3fd806dc55f167c72ac8ef7a3b6baed915e in v1-train.

https://github.com/mozilla-b2g/gaia/commits/v1.1.0hd

Just did some simple test, I didn't find any significant error.. Hope I didn't make mistakes.
John may you take a look on the current v1.1.0hd? and if things goes well may you set flags for bugs, thanks a lot!

I'll leave this bug open until things get confirmed.

Comment 5

[John Ford [:jhford] CET/CEST Berlin Time]

(In reply to KM Lee [:rexboy] from comment #4)
> Merged v1-train into v1.1.0hd until commit
> f1d2e3fd806dc55f167c72ac8ef7a3b6baed915e in v1-train.
> 
> https://github.com/mozilla-b2g/gaia/commits/v1.1.0hd
> 
> Just did some simple test, I didn't find any significant error.. Hope I
> didn't make mistakes.
> John may you take a look on the current v1.1.0hd? and if things goes well
> may you set flags for bugs, thanks a lot!
> 
> I'll leave this bug open until things get confirmed.

Can you let me know the commit range that you merged in?  Otherwise, it's not really possible for me to know how far back in history to comment/set flags on.

Comment 6

[KM Lee [:rexboy] (inactivate after Sep. 22)]

The range is from
0417587583a19dc52e24350052f4ce1195f0241c (Bug 883829, Jun. 29)to f1d2e3fd806dc55f167c72ac8ef7a3b6baed915e (Bug 893614, Jul. 17).

The following comparison may help:
https://github.com/mozilla-b2g/gaia/compare/56b6e5...ac6b3e

Comment 7

[KM Lee [:rexboy] (inactivate after Sep. 22)]

Does all the commits being marked?

If there are no further problems on this merge I would like to close this bug.

Comment 8

[John Ford [:jhford] CET/CEST Berlin Time]

(In reply to KM Lee [:rexboy] from comment #7)
> Does all the commits being marked?
> 
> If there are no further problems on this merge I would like to close this
> bug.

I marked all of the commits.  Let's close this bug!  Thanks everyone

Comment 9

[KM Lee [:rexboy] (inactivate after Sep. 22)]

Thank you John!