Hi Ehsan, Someone else (jlebar perhaps?) ran into this from switching between devices while in the same tree.
I think that this should be a bug. To cleanup, I'd probably abort the git changes, and then cd into the directory (I think its in frameworks/base) and check for changes, which you should checkout (to throw away) and try the repo sync again. I think what might be happening is that some devices apply patches to the tree, and when switching to a different device, it doesn't undo those patches, so they look like local changes instead. Dave Hylands ----- Original Message ----- > From: "Ehsan Akhgari" <[email protected]> > To: "dev-b2g" <[email protected]> > Sent: Monday, August 12, 2013 8:10:17 AM > Subject: [b2g] ./repo sync failing on master > > I tried asking on #b2g but didn't get an answer. I am trying to config my > build for the inari device, and I get this error during repo sync (which > runs as part of config.sh): > > ehsan@teenux:~/moz/b2g$ ./repo sync -l > Syncing work tree: 100% (96/96), done. > > frameworks/base/: discarding 1582 commits removed from upstream > hardware/qcom/display/: discarding 323 commits removed from upstream > system/core/: discarding 224 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... > Falling back to patching base and 3-way merge... > Auto-merging services/surfaceflinger/Layer.cpp > 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 > > When you have resolved this problem run "git rebase --continue". > If you would prefer to skip this patch, instead run "git rebase --skip". > To check out the original branch and stop rebasing run "git rebase --abort". > > Does anybody know what I can do to fix this? > > Thanks! > -- > Ehsan > <http://ehsanakhgari.org/> > _______________________________________________ > dev-b2g mailing list > [email protected] > https://lists.mozilla.org/listinfo/dev-b2g > _______________________________________________ dev-b2g mailing list [email protected] https://lists.mozilla.org/listinfo/dev-b2g
