./repo sync failing on master

[Ehsan Akhgari]

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/>

[Dave Hylands]

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

> _______________________________________________
> dev-b2g mailing list
> dev...@lists.mozilla.org
> https://lists.mozilla.org/listinfo/dev-b2g
>

[Ehsan Akhgari]

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

[Dave Hylands]

Hi Ehsan,

Hmm. I'll have to try and reproduce locally to see if I can figure out what's going on.

When I make a clone, I nornally rsync the .repo directory tree, and then rerun ./config.sh

The .repo tree has all of the repositories in it, although I'm concerned it may still think that there is a merge in progress or something.

Dave Hylands

----- Original Message -----
> From: "Ehsan Akhgari" <ehsan....@gmail.com>

[Jed Davis]

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

[Ehsan Akhgari]

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

[Ehsan Akhgari]

Actually, Sotaro suggested that I should justy rm -rf the bad
directories and that made ./repo sync happy again!