你这重复发两遍我都不知道回哪边了。。。 看起来你的 working directory 被你修改了,所以同步失败,repo diff 应该能看到你修改的内容。
如果你想覆盖你的修改内容可以直接 `repo sync --force-sync .repo/manifests`,这个在你的错误信息里也提到了。 On Sunday, September 9, 2018 at 9:30:20 PM UTC+8, Shuaiqi Li wrote: > > * [new tag] webview-m40_r1 -> webview-m40_r1 > * [new tag] webview-m40_r2 -> webview-m40_r2 > * [new tag] webview-m40_r3 -> webview-m40_r3 > * [new tag] webview-m40_r4 -> webview-m40_r4 > Traceback (most recent call last): > File "/home/android/aosp711/.repo/repo/main.py", line 531, in <module> > _Main(sys.argv[1:]) > File "/home/android/aosp711/.repo/repo/main.py", line 507, in _Main > result = repo._Run(argv) or 0 > File "/home/android/aosp711/.repo/repo/main.py", line 180, in _Run > result = cmd.Execute(copts, cargs) > File "/home/android/aosp711/.repo/repo/subcmds/init.py", line 399, in > Execute > self._SyncManifest(opt) > File "/home/android/aosp711/.repo/repo/subcmds/init.py", line 245, in > _SyncManifest > m.MetaBranchSwitch() > File "/home/android/aosp711/.repo/repo/project.py", line 2913, in > MetaBranchSwitch > self.Sync_LocalHalf(syncbuf) > File "/home/android/aosp711/.repo/repo/project.py", line 1327, in > Sync_LocalHalf > self._InitWorkTree(force_sync=force_sync) > File "/home/android/aosp711/.repo/repo/project.py", line 2477, in > _InitWorkTree > raise e > error.GitError: --force-sync not enabled; cannot overwrite a local work > tree. If you're comfortable with the possibility of losing the work tree's > git metadata, use `repo sync --force-sync .repo/manifests` to proceed. > root@389234d4f518:/home/android/aosp711# --force-sync not enabled; cannot > overwrite a local work tree.error.GitError: --force-sync not enabled; > cannot overwrite a local work tree. > > > 每次到 webview 的时候,就会出现这个问题,按提示也没有用~~~ -- You received this message because you are subscribed to the Google Groups "TUNA 主邮件列表" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. For more options, visit https://groups.google.com/d/optout.
