error: frameworks/base/: platform/frameworks/base checkout

[ay]

Hi,

I've got a problem about 'repo sync'

When the sync was finished, I'd got a error msg that is

"error: frameworks/base/: platform/frameworks/base checkout
4b77609a983b08f163853df2a77e1d535d684aec"

From git://git.omapzoom.org/device/ti/blaze
1086091..138c3f5 ics-mr1 -> omap-mirror/ics-mr1
Fetching projects: 100% (171/171), done.
Syncing work tree: 59% (101/171) media/libmediaplayerservice/
MediaPlayerService.cpp: needs merge
error: you need to resolve your current index first
Syncing work tree: 100% (171/171), done.

frameworks/base/: discarding 14 commits
error: frameworks/base/: platform/frameworks/base checkout
4b77609a983b08f163853df2a77e1d535d684aec


How can I solve it?

pls, help me~!

[Magnus Bäck]

On Fri, Mar 9, 2012 at 4:40 AM,
ay <ay....@siliconarts.co.kr> wrote:

> I've got a problem about 'repo sync'
>
> When the sync was finished, I'd got a error msg that is
>
> "error: frameworks/base/: platform/frameworks/base checkout
> 4b77609a983b08f163853df2a77e1d535d684aec"

IIRC, this indicates that your frameworks/base tree is dirty, i.e. you
have changed files there. Either commit those changes to a topic
branch or get rid of them with "git stash" or "git reset --hard".

A "git status" in the frameworks/base directory will tell you what's up.

When you've cleaned up, a quick "repo sync -l frameworks/base" will
restart the previously aborted operation.

[...]

--
Magnus Bäck
ba...@google.com