Thanks for the reply!
On 2013-08-12 2:40 PM, Dave Hylands wrote:
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.
Yeah, well, the problem is, I don't know which directories to clean up.
I tried this but the below didn't help at all.
ehsan@teenux:~/moz/b2g$ ./repo sync -dl
Syncing work tree: 100% (96/96), done.
error: frameworks/base/: prior sync failed; rebase still in progress
error: hardware/qcom/display/: prior sync failed; rebase still in progress
error: system/core/: prior sync failed; rebase still in progress
ehsan@teenux:~/moz/b2g$ cd frameworks/base/
ehsan@teenux:~/moz/b2g/frameworks/base$ git rebase --abort
ehsan@teenux:~/moz/b2g/frameworks/base$ cd -
/home/ehsan/moz/b2g
ehsan@teenux:~/moz/b2g$ cd hardware/qcom/display/
ehsan@teenux:~/moz/b2g/hardware/qcom/display$ git rebase --abort
ehsan@teenux:~/moz/b2g/hardware/qcom/display$ cd -
/home/ehsan/moz/b2g
ehsan@teenux:~/moz/b2g$ cd system/core/
ehsan@teenux:~/moz/b2g/system/core$ git rebase --abort
ehsan@teenux:~/moz/b2g/system/core$ cd -
/home/ehsan/moz/b2g
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".
Should I just give up and reclone from scratch? I'd like to avoid that
at all costs as I would like to get a build in finite time. ;-)
Thanks!
Ehsan
_______________________________________________
dev-b2g mailing list
[email protected]
https://lists.mozilla.org/listinfo/dev-b2g
