897623 - config.sh emulator fails with patch conflict in frameworks/base

Status: RESOLVED WORKSFORME

(Firefox OS Graveyard :: GonkIntegration, defect)

Description

[Justin Lebar (not reading bugmail)]

> $ BRANCH=v1-train ./config.sh emulator 
> Get git://github.com/mozilla-b2g/b2g-manifest
> remote: Counting objects: 787, done.
> remote: Compressing objects: 100% (417/417), done.
> remote: Total 787 (delta 509), reused 604 (delta 351)
> Receiving objects: 100% (787/787), 166.37 KiB | 0 bytes/s, done.
> Resolving deltas: 100% (509/509), done.
> From git://github.com/mozilla-b2g/b2g-manifest
>  * [new branch]      master     -> origin/master
>  * [new branch]      v1-train   -> origin/v1-train
>  * [new branch]      v1.0.0     -> origin/v1.0.0
>  * [new branch]      v1.0.1     -> origin/v1.0.1
>  * [new branch]      v1.1.0hd   -> origin/v1.1.0hd
>  * [new tag]         B2G_1_0_1_20130213094222 -> B2G_1_0_1_20130213094222
>  * [new tag]         B2G_1_1_0_hd_20130530182315 -> B2G_1_1_0_hd_20130530182315
>  * [new tag]         B2G_1_1_0_hd_20130530182315_BASE -> B2G_1_1_0_hd_20130530182315_BASE
>  * [new tag]         closing-nightly -> closing-nightly
> 
> Your identity is: Justin Lebar <[e-mail]>
> If you want to change this, please re-run 'repo init' with --config-name
> 
> repo has been initialized in /Volumes/case_sensitive/B2G
> Fetching projects: 100% (83/83), done.  
> Syncing work tree: 100% (83/83), done.  
> 
> frameworks/base/: manifest switched b2g/ics_strawberry_v1...612ca9c6a55bd932c45f5b85ae932a1b712dd914
> frameworks/base/: discarding 2396 commits removed from upstream
> system/core/: manifest switched b2g/ics_strawberry_v1...91e5551f88aea5aa64e1b4f8b4b52d7be2b28b64
> system/core/: discarding 335 commits removed from upstream
> system/vold/: manifest switched b2g/ics_strawberry_v1...3ad9072a5d6f6bda32123b367545649364e3c11d
> system/vold/: discarding 3 commits removed from upstream
> project frameworks/base/
> First, rewinding head to replay your work on top of it...
> Applying: B2G Adaptations
> Using index info to reconstruct a base tree...
> M	include/media/stagefright/OMXCodec.h
> M	media/libstagefright/OMXCodec.cpp
> M	media/libstagefright/omx/OMXNodeInstance.cpp
> M	services/surfaceflinger/Layer.cpp
> Falling back to patching base and 3-way merge...
> Auto-merging media/libstagefright/omx/OMXNodeInstance.cpp
> Auto-merging media/libstagefright/OMXCodec.cpp
> CONFLICT (content): Merge conflict in media/libstagefright/OMXCodec.cpp
> Auto-merging include/media/stagefright/OMXCodec.h
> Recorded preimage for 'media/libstagefright/OMXCodec.cpp'
> Failed to merge in the changes.
> Patch failed at 0001 B2G Adaptations
> The copy of the patch that failed is found in:
>    /Volumes/case_sensitive/B2G/frameworks/base/.git/rebase-apply/patch
> 
> When you have resolved this problem, run "git rebase --continue".
> If you prefer to skip this patch, run "git rebase --skip" instead.
> To check out the original branch and stop rebasing, run "git rebase --abort".
> 
> 
> Repo sync failed

If we get past frameworks/base, then I get another conflict in system/core:

> $ BRANCH=v1-train ./config.sh emulator 
> Get git://github.com/mozilla-b2g/b2g-manifest
> remote: Counting objects: 787, done.
> remote: Compressing objects: 100% (417/417), done.
> remote: Total 787 (delta 509), reused 604 (delta 351)
> Receiving objects: 100% (787/787), 166.37 KiB | 124.00 KiB/s, done.
> Resolving deltas: 100% (509/509), done.
> From git://github.com/mozilla-b2g/b2g-manifest
>  * [new branch]      master     -> origin/master
>  * [new branch]      v1-train   -> origin/v1-train
>  * [new branch]      v1.0.0     -> origin/v1.0.0
>  * [new branch]      v1.0.1     -> origin/v1.0.1
>  * [new branch]      v1.1.0hd   -> origin/v1.1.0hd
>  * [new tag]         B2G_1_0_1_20130213094222 -> B2G_1_0_1_20130213094222
>  * [new tag]         B2G_1_1_0_hd_20130530182315 -> B2G_1_1_0_hd_20130530182315
>  * [new tag]         B2G_1_1_0_hd_20130530182315_BASE -> B2G_1_1_0_hd_20130530182315_BASE
>  * [new tag]         closing-nightly -> closing-nightly
> 
> Your identity is: Justin Lebar <[e-mail]>
> If you want to change this, please re-run 'repo init' with --config-name
> 
> repo has been initialized in /Volumes/case_sensitive/B2G
> Fetching projects:  14% (12/83)  remote: Counting objects: 6, done.
> remote: Compressing objects: 100% (4/4), done.
> remote: Total 4 (delta 2), reused 0 (delta 0)
> Unpacking objects: 100% (4/4), done.
> From git://codeaurora.org/platform/libcore
>    eeb7a5e..e6b288f  aosp-new/master -> caf/aosp-new/master
> Fetching projects: 100% (83/83), done.  
> Syncing work tree: 100% (83/83), done.  
> 
> system/core/: manifest switched b2g/ics_strawberry_v1...91e5551f88aea5aa64e1b4f8b4b52d7be2b28b64
> system/core/: discarding 335 commits removed from upstream
> system/vold/: manifest switched b2g/ics_strawberry_v1...3ad9072a5d6f6bda32123b367545649364e3c11d
> system/vold/: discarding 3 commits removed from upstream
> error: frameworks/base/: prior sync failed; rebase still in progress
> project system/core/
> First, rewinding head to replay your work on top of it...
> Applying: B2G Adaptations
> Using index info to reconstruct a base tree...
> M	include/private/android_filesystem_config.h
> A	rootdir/etc/init.qcom.post_boot.sh
> M	rootdir/init.rc
> Falling back to patching base and 3-way merge...
> Auto-merging rootdir/init.rc
> CONFLICT (modify/delete): rootdir/etc/init.qcom.post_boot.sh deleted in HEAD and modified in B2G Adaptations. Version B2G Adaptations of rootdir/etc/init.qcom.post_boot.sh left in tree.
> Auto-merging include/private/android_filesystem_config.h
> Failed to merge in the changes.
> Patch failed at 0001 B2G Adaptations
> The copy of the patch that failed is found in:
>    /Volumes/case_sensitive/B2G/system/core/.git/rebase-apply/patch
> 
> When you have resolved this problem, run "git rebase --continue".
> If you prefer to skip this patch, run "git rebase --skip" instead.
> To check out the original branch and stop rebasing, run "git rebase --abort".
> 
> 
> Repo sync failed

Comment 1

[Dave Hylands [:dhylands]]

Hmm. I just did:

BRANCH=v1-train ./config.sh emulator

and it worked without any problems for me.

Comment 2

[Dave Hylands [:dhylands]]

It looks like you have a "B2G Adaptations" branch or something?

This seems to be failing as part of the "repo sync" I'm pretty sure that any patches we apply would be after the repo sync, not during.

Comment 3

[Justin Lebar (not reading bugmail)]

> It looks like you have a "B2G Adaptations" branch or something?

That's not a branch I created.

Comment 4

[Justin Lebar (not reading bugmail)]

I nuked my repo and re-cloned and everything works now.

I'm really concerned about this, though.  As the number of devices we have increases, it's critical that switching between devices work properly.  I hope this isn't a common failure.