Error upon completion of repo sync -- local changes indicated cannot switch branches

531 views
Skip to first unread message

kk

unread,
Jun 12, 2009, 4:13:46 AM6/12/09
to Repo and Gerrit Discussion
Hi All,

I initially had the problem discussed in discussion thread link
below,

http://groups.google.com/group/repo-discuss/browse_thread/thread/9924877a1e8e678a/953392c7526c0a16?#953392c7526c0a16

The remote continued to disconnect unexpectedly during the repo
sync.

This issue has since been resolved without any new action on my part
other than was indicated from my initial response in thread discussion
above, however currently the errors below are being indicated.

I followed the steps related to possible corruption indicated in Known
Issues documention:

FIXED: "remote: aborting due to possible repository corruption on the
remote side" during repo sync
We had to rebuild some of the repositories to fix the "checksum
mismatch" problem; unfortunately, the most straightforward way to
recover from this is to delete your whole tree and start over with
repo init.

You can also try:

* remove the iptables, pcap, tcpdump git repositories under .repo/
projects/external, along with their working directories in external/
* rm -rf .repo/manifest*
* repo init -u git://android.git.kernel.org/platform/manifest.git
* repo sync

But the issue remains unresolved.

How can I resolve these errors? Other than just removing the whole
repository tree from my system.

What may be causing these errors?

I have not made any local changes intentionally (I have not updated
any files locally), I assume the changes have been introduced by
initiating [repo sync] on several different occassions.



Errors:

>repo sync

Fetching projects: 100% (113/113), done.
error: You have local changes to 'core/apicheck_msg_current.txt';
cannot switch branches.
error: You have local changes to 'docs/dex-format.html'; cannot switch
branches.
error: You have local changes to 'tools/scripts/android_rules.xml';
cannot switch branches.
error: You have local changes to 'codecs_v2/audio/gsm_amr/amr_nb/
common/include/basic_op_c_equivalent.h'; cannot switch branches.
error: You have local changes to 'core/java/android/app/
Notification.java'; cannot switch branches.
Syncing work tree: 77% (87/112) error: You have local changes to
'res/values/strings.xml'; cannot switch branches.
Syncing work tree: 78% (88/112) error: You have local changes to
'res/values/strings.xml'; cannot switch branches.
Syncing work tree: 93% (105/112) error: You have local changes to
'src/com/android/providers/media/MediaProvider.java'; cannot switch
branches.
Syncing work tree: 98% (110/112) error: You have local changes to
'adb/commandline.c'; cannot switch branches.
Syncing work tree: 100% (112/112), done.

error: build/: platform/build checkout
6c8cafac168e2cc2425a944717082ebe68795df7
error: dalvik/: platform/dalvik checkout
c1b54205471ea7824c87e53e0d9e6d4c30518007
error: development/: platform/development checkout
8bbfa508be9430ef8a964af02942ac854a0f9cbb
error: external/opencore/: platform/external/opencore checkout
fd46810380dc8857b48fb5100bd359a5a71f85d5
error: frameworks/base/: platform/frameworks/base checkout
75c567a8dc16634477962f9bafa5205948b974c3
error: packages/apps/Mms/: platform/packages/apps/Mms checkout
48e2ed5031f9812b25dbb0de9957f45a6c27a933
error: packages/apps/Music/: platform/packages/apps/Music checkout
8c70f9d05ac86551de20beb62ffefb5c3654584c
error: packages/providers/MediaProvider/: platform/packages/providers/
MediaProvider checkout 9f02f449f6951b15bb9daaa3fc6e1d648b36b08a
error: system/core/: platform/system/core checkout
417a3235350b2bb016625f40ffb22c356a51f046



Rgds,

KK

Reply all
Reply to author
Forward
0 new messages