None of this has helped unfortunately. I think I'm going to bite the bullet and reclone after wasting a few days hoping that somebody would know how to get me out of this mess. :/

Ehsan

On 2013-08-12 7:52 PM, Jed Davis wrote:
On Mon, Aug 12, 2013 at 06:20:44PM -0400, Ehsan Akhgari wrote:
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

Maybe something more like this:

( cd frameworks/base && git rebase --abort ) && \
( cd hardware/qcom/display && git rebase --abort ) && \
( cd system/core && git rebase --abort ) && \
./repo sync -dl

There's also "repo forall", which might help.

Also, config.sh passes options like -d and -l through to repo sync, for
just such reasons.  The default -- and I think I was talking about this
on IRC the other day? -- could probably do with some improvement.

--Jed


_______________________________________________
dev-b2g mailing list
[email protected]
https://lists.mozilla.org/listinfo/dev-b2g

Reply via email to