Android repo Q&A

最新推荐文章于 2023-11-10 08:22:11 发布
最新推荐文章于 2023-11-10 08:22:11 发布
阅读量5.9k 收藏 1
点赞数
分类专栏： Tools
版权声明：本文为博主原创文章，遵循 CC 4.0 BY-SA 版权协议，转载请附上原文出处链接和本声明。
本文链接：https://blog.csdn.net/Wuhzossibility/article/details/46559875
版权

1. repo sync失败？

error: Your local changes to the following files would be overwritten by checkout:
<span style="white-space:pre">	</span>default.xml
Please, commit your changes or stash them before you can switch branches.
Aborting
error: .repo/manifests/: manifests checkout d3c00c789b3ab2f87c88c6d7b516d8cc8a41efcf 
Traceback (most recent call last):
  File "/home/exocet/codePrj/fisher/google/system/.repo/repo/main.py", line 506, in <module>
    _Main(sys.argv[1:])
  File "/home/exocet/codePrj/fisher/google/system/.repo/repo/main.py", line 482, in _Main
    result = repo._Run(argv) or 0
  File "/home/exocet/codePrj/fisher/google/system/.repo/repo/main.py", line 161, in _Run
    result = cmd.Execute(copts, cargs)
  File "/home/exocet/codePrj/fisher/google/system/.repo/repo/subcmds/init.py", line 390, in Execute
    self._SyncManifest(opt)
  File "/home/exocet/codePrj/fisher/google/system/.repo/repo/subcmds/init.py", line 239, in _SyncManifest
    m.Sync_LocalHalf(syncbuf)
  File "/home/exocet/codePrj/fisher/google/system/.repo/repo/project.py", line 1264, in Sync_LocalHalf
    upstream_gain = self._revlist(not_rev(HEAD), revid)
  File "/home/exocet/codePrj/fisher/google/system/.repo/repo/project.py", line 2309, in _revlist
    return self.work_git.rev_list(*a, **kw)
  File "/home/exocet/codePrj/fisher/google/system/.repo/repo/project.py", line 2503, in rev_list
    p.stderr))
error.GitError: manifests rev-list ('^HEAD', u'd3c00c789b3ab2f87c88c6d7b516d8cc8a41efcf', '--'): fatal: bad revision '^HEAD'

A： 查看一下有没有本地分支； -- 很可能你误操作把本地默认分支给整没了！

    $ git --git-dir=.repo/manifests/.git/ branch -a

正常情形（纯净版本）：

$ git --git-dir=.repo/manifests/.git/ branch -a
* default
  remotes/m/android-4.4.4_r2 -> origin/android-4.4.4_r2
  remotes/m/android-5.0.0_r5 -> origin/android-5.0.0_r5
  remotes/origin/adt_23.0.3
  remotes/origin/android-1.6_r1
  remotes/origin/android-1.6_r1.1
  remotes/origin/android-1.6_r1.2
  remotes/origin/android-1.6_r1.3
  remotes/origin/android-1.6_r1.4
  remotes/origin/android-1.6_r1.5
  remotes/origin/android-1.6_r2
  remotes/origin/android-2.0.1_r1

出错情形，default没了：

$ git --git-dir=.repo/manifests/.git/ branch -a
  remotes/m/android-4.4.4_r2 -> origin/android-4.4.4_r2
  remotes/m/android-5.0.0_r5 -> origin/android-5.0.0_r5
  remotes/origin/adt_23.0.3
  remotes/origin/android-1.6_r1
  remotes/origin/android-1.6_r1.1
  remotes/origin/android-1.6_r1.2
  remotes/origin/android-1.6_r1.3
  remotes/origin/android-1.6_r1.4
  remotes/origin/android-1.6_r1.5
  remotes/origin/android-1.6_r2
  remotes/origin/android-2.0.1_r1
  remotes/origin/android-2.0_r1
  remotes/origin/android-2.1_r1
  remotes/origin/android-2.1_r2
  remotes/origin/android-2.1_r2.1p
  remotes/origin/android-2.1_r2.

默认本地分支指向default的！由于我想sync到android-5.1.1_r4版本，就出现上面的错误了；

        $ repo init -u https://android.googlesource.com/platform/manifest -b android-5.1.1_r4
   

    提示我default.xml被修改了，status一下：

        $ git --git-dir=.repo/manifests/.git/ status 

    除了default.xml被修改，其余整个目录都被 Untracked了！

    删除.repo太不明智了，.repo就得几十个G！

    

    由于不熟悉repo，又不想删掉重下，做了如下处理：

    能否checkout 出一个新的本地分支？

    $ git --git-dir=.repo/manifests/.git/ checkout android-5.0.0_r5

$ git --git-dir=.repo/manifests/.git/ checkout android-5.0.0_r5
D	default.xml
Note: checking out 'android-5.0.0_r5'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:

  git checkout -b new_branch_name

HEAD is now at fa50451... Manifest for Android 5.0.0 release 5

$ git --git-dir=.repo/manifests/.git/ branch -a
* (no branch)
  remotes/m/android-4.4.4_r2 -> origin/android-4.4.4_r2
  remotes/m/android-5.0.0_r5 -> origin/android-5.0.0_r5
  remotes/origin/adt_23.0.3
  remotes/origin/android-1.6_r1
看来切换成功了？ 

$ git --git-dir=.repo/manifests/.git/ checkout -b android-5.0.0_r5
D	default.xml
Switched to a new branch 'android-5.0.0_r5'
[exocet@exocet:system]$ git --git-dir=.repo/manifests/.git/ branch -a
* android-5.0.0_r5
  remotes/m/android-4.4.4_r2 -> origin/android-4.4.4_r2
  remotes/m/android-5.0.0_r5 -> origin/android-5.0.0_r5
  remotes/origin/adt_23.0.3
好的，repo sync一下： 

$ ./repo-sync 
Starting repo sync ...
error: Your local changes to the following files would be overwritten by checkout:
	default.xml
Please, commit your changes or stash them before you can switch branches.
Aborting
.repo/manifests/: leaving android-5.0.0_r5; does not track upstream
error: .repo/manifests/: manifests checkout b5be3a6e170421b0ebb310162c77fb4d171a3742 
“ **Error: sync failed, re-sync again** ”
error: Your local changes to the following files would be overwritten by checkout:
	default.xml
Please, commit your changes or stash them before you can switch branches.
Aborting
.repo/manifests/: leaving android-5.0.0_r5; does not track upstream
error: .repo/manifests/: manifests checkout b5be3a6e170421b0ebb310162c77fb4d171a3742 
“ **Error: sync failed, re-sync again** ”
根据提示stash一下，就是我想切换分支有不想提交当前的修改： 

 git --git-dir=.repo/manifests/.git/ stash 
Saved working directory and index state WIP on android-5.0.0_r5: fa50451 Manifest for Android 5.0.0 release 5
HEAD is now at fa50451 Manifest for Android 5.0.0 release 5
[exocet@exocet:system]$ git --git-dir=.repo/manifests/.git/ branch -a
* android-5.0.0_r5
  remotes/m/android-4.4.4_r2 -> origin/android-4.4.4_r2
  remotes/m/android-5.0.0_r5 -> origin/android-5.0.0_r5
  remotes/origin/adt_23.0.3
  remotes/origin/android-1.6_r1
  remotes/origin/android-1.6_r1.1
  remotes/origin/android-1.6_r1.2
  remotes/origin/android-1.6_r1.3
执行成功，sync一下： 

$ ./repo-sync 
Starting repo sync ...
error: Your local changes to the following files would be overwritten by checkout:
	default.xml
Please, commit your changes or stash them before you can switch branches.
Aborting
.repo/manifests/: leaving android-5.0.0_r5; does not track upstream
error: .repo/manifests/: manifests checkout b5be3a6e170421b0ebb310162c77fb4d171a3742 
“ **Error: sync failed, re-sync again** ”
还是出错了，好吧，先repo branches本地工作分支做个备份：

$ repo start android-5.0.0_r5-Hz --all
$  repo checkout android-5.0.0_r5-Hz
$ repo branches
*  android-5.0.0_r5-Hz       | in all projects

接着我最终是想sync到 android-5.1.1_r4，再试一次：

$ git --git-dir=.repo/manifests/.git/ checkout android-5.1.1_r4
Note: checking out 'android-5.1.1_r4'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:

  git checkout -b new_branch_name

HEAD is now at d3c00c7... Manifest for Android 5.1.1 release 4
[exocet@exocet:system]$ git --git-dir=.repo/manifests/.git/ branch 
* (no branch)
  android-5.0.0_r5
ok，已经切换到android-5.1.1_r4， 
$ ./repo-sync 
Starting repo sync ...
error: Your local changes to the following files would be overwritten by checkout:
	default.xml
Please, commit your changes or stash them before you can switch branches.
Aborting
.repo/manifests/: discarding 38 commits
error: .repo/manifests/: manifests checkout b5be3a6e170421b0ebb310162c77fb4d171a3742 
“ **Error: sync failed, re-sync again** ”

error: Your local changes to the following files would be overwritten by checkout:
	default.xml
Please, commit your changes or stash them before you can switch branches.
Aborting
.repo/manifests/: discarding 38 commits
error: .repo/manifests/: manifests checkout b5be3a6e170421b0ebb310162c77fb4d171a3742 
“ **Error: sync failed, re-sync again** ”

我们已经在android-5.1.1_r4上了，但是有修改没有提交，提交或者放弃就可以了，

上面stash不行，这里直接reset掉：

$ cd .repo/manifests
[exocet@exocet:manifests]$ ls
default.xml
[exocet@exocet:manifests]$ git reset --hard 
HEAD is now at d3c00c7 Manifest for Android 5.1.1 release 4
熟悉的味道又回来了： 

$ repo sync
.repo/manifests/: discarding 38 commits
Fetching project platform/external/timezonepicker-support
Fetching project platform/packages/wallpapers/HoloSpiral
Fetching project platform/hardware/invensense
Fetching project platform/packages/apps/Dialer
Fetching projects:   0% (1/471)  Fetching project platform/external/iproute2
Fetching project device/google/accessory/demokit
Fetching project platform/hardware/intel/bootstub

2. fatal: git fetch-pack: expected shallow list?

A：查看一下git --version，

shallow需要1.9.+以上的版本支持，更新一下git就ok了；



fishOnFly
关注
  • 0
    点赞
  • 踩
  • 1
    收藏
    觉得还不错? 一键收藏
  • 0
    评论
专栏目录
Android下的配置管理之道之repo的使用
马哥私房菜
11-08 1万+
Android下的配置管理之道之repo的使用
Android repo 小结
zhangxiaofan800的博客
04-08 89
一、安装 创建目录和修改环境变量 $ mkdir ~/bin $ PATH=~/bin:$PATH 下载repo代码 $ curl https://storage.googleapis.com/git-repo-downloads/repo > ~/bin/repo $ chmod a+x ~/bin/repo 二、帮助 repo help 查询具体命令的帮助 repo help <COMMAND> Repo 仓库状态 repo help init 状态 rep
解决error: Your local changes to the following files would be overwritten by merge
qq_40024178的博客
10-05 1665
解决error: Your local changes to the following files would be overwritten by merge
git上传失败
qq_43574083的博客
04-03 1027
git 历史地址没了， 重新设定 git remote add ****(地址) git push -u prigin master
解决“Your local changes to the following files would be overwritten by merge“
最新发布
奇妙的Bug之旅
11-10 1万+
这个错误通常在尝试合并（merge）你的本地更改到远程仓库时出现。当你的本地更改与远程仓库中的更改冲突时，Git会阻止你进行合并操作，并显示这个错误消息。
git创建分支并提交码云
09-08 1922
1.查看当前分支。 git branch 2。创建本地分支 git checkout -b branch111 image.png 3.测试 在创建分支下更改文件 image.png 查看远程分支并提交 image.png 提交本地分支，发现抱错，但git给提示该如何下一步进行 git push //报错 image.png git push --set-upstream origin branch111...
【Android】【VCS版本管理系统】Android多工程项目的版本管理工具——Repo
The_Beauty_Of_IT的博客
04-03 286
repo Hooks。
Android代码-AndroidInterview-Q-A
08-06
The top Internet companies android interview questions and answers Github Repo welcome star | Github 仓库 欢迎star 中文版Gitbook English Doc English version gitbook is coming soon..
alps_aquaris_a45_q：为Aquaris A4.5构建android q的配置
02-16
5. **编译环境设置**：构建Android Q通常需要安装Android SDK、NDK、repo工具，并且配置环境变量。开发者可能还需要克隆完整的Android源代码仓库，并在其中添加或修改与Aquaris A4.5相关的代码分支。 6. **编译步骤...
Android Q紧急号码配置
wcsbhwy的博客
06-05 1990
文章目录适用版本配置方法如何更新AOSP eccdata举例1. 客制化特定国家的紧急号码2. 客制化特定运营商的紧急号码3. 客制化特定大区的紧急号码4. 客制化假紧急号码5. 客制化有卡紧急号码（无卡不是紧急号码）Q上新增功能6. 客制化无卡紧急号码（有卡不是紧急号码） 适用版本 Android 10(Q)及以后版本 配置方法 从Android Q开始，google提供了新的紧急号码配置方法(packages/services/Telephony/ecc), 同时MTK还支持通过ecc_list.xml
git 设置 upstream 上游代码库
fareast_mzh的博客
07-27 1174
git/config在这个文件追加,改完了之后gitremote-v查看生效。执行之后，gitremote-v没有改变。在项目目录下编辑这个文件。
Git之解决error.GitError: manifests rev-list ^HEAD(三十一)
Android系统攻城狮
06-01 4872
error.GitError: manifests rev-list ('^HEAD', '14686468c69c63f1995ab2a0a9ad90b2e1d5e01c', '--'): fatal: bad revision '^HEAD'
解决"requested upstream branch 'origin/master' does not exist"
热门推荐
jack22001的博客
02-26 3万+
问题： 1、本地初始化了git仓库，放了一些文件进去并进行了add操作和commit提交操作； 2、github创建了git仓库并建立了README，.gitignore等文件； 3、本地仓库添加了github上的git仓库作为远程仓库，起名origin；       git remote add origin 远程仓库地址 4,本地仓库也远程仓库关联 git branch ...
repo使用过程中遇到的一些问题及解决办法
longxiaowu的专栏
05-23 2万+
作为新入职的菜鸟，过去的这半个月忙的是焦头烂额的，碰到了许多问题，但都没时间好好记下来。趁着今天这点时间，记录一下有关repo使用过程中碰到的一些问题及解决办法吧！ 一、repo sync时出现 error: .repo/manifests/: contains uncommitted changes 这样的错误提示。从字面意思上看是代码有改动但是没有commit。但好几次我查看了代码，把改动通
error: .repo/manifests/: prior sync failed; rebase still in progress
LIUW的博客
12-27 4601
问题最近在使用repo拉项目时，碰到了这个问题，只知道是操作失误导致的，但就是想不起来具体是哪步所致。网上找了很多基本都是同一个帖子原因是git本地有改动导致的，而我的文件夹是新建的，不存在git操作，所以和我的问题不匹配，最后折腾了好久才解决！原因及解决办法其实原因很简单，找到你的工作空间根目录或者新建文件夹的根目录，执行ls -al，查看列表里是否出现.repo的文件，有的话再执行rm -rf
repo+manifests+git方式管理安卓代码
weixin_34370347的博客
03-16 582
repo+manifests+git方式管理安卓代码1.repo的获取repo只是google用Python脚本写的调用git的一个脚本，主要是用来下载、管理Android项目的软件仓库。(也就是说，他是用来管理git所管理的一个个仓库)，可以简化android开发中git的使用。先从谷歌那里获取源，下面脚本是一个样例脚本，将获取的repo和谷歌mirror源下的源代码#!/...
repo sync出现contains uncommitted changes错误解决办法
MY_RENZHIBO的专栏
05-15 3084
repo forall -c "git reset --hard &amp;&amp; git clean -fd &amp;&amp; git pull"参见：https://blog.csdn.net/u012637313/article/details/48028161
Android源代码仓库及其管理工具Repo分析
xiaoheliushuiya
01-20 634
软件工程由于需要不断迭代开发，因此要对源代码进行版本管理。Android源代码工程（AOSP）也不例外，它采用Git来进行版本管理。AOSP作为一个大型开放源代码工程，由许许多多子项目组成，因此不能简单地用Git进行管理，它在Git的基础上建立了一套自己的代码仓库，并且使用工具Repo进行管理。工欲善其事，必先利其器。本文就对AOSP代码仓库及其管理工具repo进行分析，以便提高我们日常开发效率...
android repo
04-03
The code is hosted on a Git server and can be accessed by developers using the command-line tool "repo." The Android repo includes code for the operating system itself, as well as additional ...
评论
添加红包

请填写红包祝福语或标题

个

红包个数最小为10个

元

红包金额最低5元

当前余额3.43元 前往充值 >
需支付：10.00元
成就一亿技术人!
领取后你会自动成为博主和红包主的粉丝 规则
hope_wisdom
发出的红包
实付元
使用余额支付
点击重新获取
扫码支付
钱包余额 0

抵扣说明：

1.余额是钱包充值的虚拟货币，按照1:1的比例进行支付金额的抵扣。
2.余额无法直接购买下载，可以购买VIP、付费专栏及课程。

余额充值