Repo sync –d resulted in the same errors. Repo forall git –c stash and then repo sync did seem to do the checkouts appropriately. My suspicion is still make clobber. There, of course, is definitely the possibility that a fat-finger was involved somewhere, too, though.
---- Tom Palarz Security Consultant Neohapsis, Inc. 773-269-6300 x301 312-231-9834 m 773-394-8314 f [email protected]<mailto:[email protected]> www.neohapsis.com<http://www.neohapsis.com/> The contents of this transmitted message are confidential and may be subject to privilege. Disclosure, copying, distribution, or use of the contents of this transmission or information it contains is prohibited if you have received this transmission in error. If you are not the named recipient, please immediately notify the sender and destroy all copies you have received. From: Tom Palarz Sent: Tuesday, April 09, 2013 9:05 AM To: Stephen Smalley; Tom Palarz Cc: [email protected] Subject: Re: Seandroid 4.2.2 release repo sync error - bad merge? Could make clobber be the cause? Sent from my Verizon Wireless Droid -----Original message----- From: Stephen Smalley <[email protected]<mailto:[email protected]>> To: Tom Palarz <[email protected]<mailto:[email protected]>> Cc: "[email protected]<mailto:[email protected]>" <[email protected]<mailto:[email protected]>> Sent: Tue, Apr 9, 2013 13:26:51 GMT+00:00 Subject: Re: Seandroid 4.2.2 release repo sync error - bad merge? On 04/08/2013 05:59 PM, Tom Palarz wrote: > Hello, > > I recently pulled the 4.2.2 code and local manifest for SE, but am getting > repo sync errors. I pulled the Android code first, built and cleaned it (per > the suggestion on SE wiki), dropped the local manifest in, and repo sync > broke. Is this a known issue or did I use a bad branch/local manifest > somewhere? > > I did git init using branch android-4.2.2_r1. Build and clean of full-eng > were successful. > I then pulled local_manifest.xml from bitbucket using branch seandroid-4.2. I > dropped that into .repo/local_manifests . > > Repo sync'd fine until it started checking out files with several errors > saying: > > Please, commit your changes or stash them before you can switch branches. > Aborting > > At the end, repo says: > error: build/: build checkout afe3536720077838d6401c3c3d62bc605d548f56 > error: device/asus/grouper/: device-asus-grouper checkout > f1f49ae17e59bbadfdac1a3b9ac6b15f482f1034 > error: device/lge/mako/: device-lge-mako checkout > 7305285325cae78c844283dd1026e683213ee02d > error: device/samsung/manta/: device-samsung-manta checkout > b5b517f03740879f3fe064d6b578eb256e316d54 > error: device/samsung/tuna/: device-samsung-tuna checkout > e315f0b86b48dfa731c1b3901f5d1d4efaa4e35b > error: external/checkpolicy/: external-checkpolicy checkout > 0d73ef7049feee794f14cf1af88d05dae8139914 > error: external/libselinux/: external-libselinux checkout > 73325928ceaf60fd22f50ce0b53c0e11cfdcabc9 > error: external/libsepol/: external-libsepol checkout > b0e0162a246f2c051427154909c0ecd694cc4805 > error: external/sepolicy/: external-sepolicy checkout > fc18c7a60b93c2ca62600d5564185f3aa657390b > error: frameworks/base/: frameworks-base checkout > 96ca793eeb2e423a2198af71330d6b37a6e6c559 > error: system/core/: system-core checkout > 963b785863cd5fea2439ee48027247365be314cb > error: system/extras/: system-extras checkout > 1796fd983498a3d1023bc32cc407fc850691957d > error: system/vold/: system-vold checkout > 72752db1f2a6dfa2b32bbf1b6c9bfcbfabad37fb > > Do I really have to repo forall -c git stash? Or, did I screw up somewhere in > pulling the local manifest? My copy of local_manifest is attached for > reference. Doesn't sound right; I normally only see those if I have local changes or if I switched to a different branch manually. Might want to try repo sync -d to detach from any local branch. I'll see if I can reproduce.
