New issue
Advanced search Search tips

Issue 698456 link

Starred by 1 user

Issue metadata

Status: Archived
Owner:
Closed: Mar 2017
Cc:
EstimatedDays: ----
NextAction: ----
OS: Chrome
Pri: 3
Type: Bug



Sign in to add a comment

Check out new public /chromiumos/docs repository to /docs

Project Member Reported by derat@chromium.org, Mar 4 2017

Issue description

I dropped several internal repositories that were getting checked out to subdirectories under the top-level /docs directory. Now I'd like to check out a new public repository there. When I test my manifest change, I get:

---

error: Cannot fetch chromiumos/docs (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 docs` to proceed.)
...
Exception in thread Thread-33:
Traceback (most recent call last):
  File "/usr/lib/python2.7/threading.py", line 810, in __bootstrap_inner
    self.run()
  File "/usr/lib/python2.7/threading.py", line 763, in run
    self.__target(*self.__args, **self.__kwargs)
  File "/derat/chromeos/.repo/repo/subcmds/sync.py", line 276, in _FetchProjectList
    success = self._FetchHelper(opt, project, *args, **kwargs)
  File "/derat/chromeos/.repo/repo/subcmds/sync.py", line 321, in _FetchHelper
    cache_dir=opt.cache_dir)
  File "/derat/chromeos/.repo/repo/project.py", line 1293, in Sync_NetworkHalf
    self._InitGitDir(force_sync=force_sync)
  File "/derat/chromeos/.repo/repo/project.py", line 2346, in _InitGitDir
    raise e
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 docs` to proceed.

---

It looks like I have an even-older .repo/projects/docs.git directory in my checkout. When I move it away, I'm able to sync the new public repository without any trouble, but I'd rather not make everyone else either do this or run the --force-sync command.

To the best of my knowledge, I never made any changes to the old repository and didn't have any local commits. Is there any way to handle this more gracefully, or should I just send out a PSA? (Why doesn't repo rename the old repository?)
 

Comment 1 by derat@chromium.org, Mar 6 2017

Any thoughts about whether there's a graceful way to do this?
i don't see an issue w/people having to use --force-sync if they too have an old checkout ?  we've done it before ...

Comment 3 by derat@chromium.org, Mar 7 2017

Status: Started (was: Assigned)
Thanks, sounds fine be me. Sent you some changes.
Project Member

Comment 4 by bugdroid1@chromium.org, Mar 7 2017

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/chromeos/manifest-internal/+/b312a4f13e5122b9824d099bd948e34b11ef1cb2

commit b312a4f13e5122b9824d099bd948e34b11ef1cb2
Author: Daniel Erat <derat@chromium.org>
Date: Tue Mar 07 08:34:10 2017

Project Member

Comment 5 by bugdroid1@chromium.org, Mar 7 2017

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/manifest/+/2d5e258a83a181d56db4159ecd81c1508a817bd3

commit 2d5e258a83a181d56db4159ecd81c1508a817bd3
Author: Daniel Erat <derat@chromium.org>
Date: Tue Mar 07 10:32:40 2017

manifest: Add docs, Python-Markdown, md_browser.

Check out a few new chromium.googlesource.com repositories:

/chromiumos/docs -> /docs
/chromium/src/third_party/Python-Markdown -> [same]
/chromium/src/tools/md_browser -> [same]

BUG= chromium:698456 
TEST=none

Change-Id: If3a533101878e13d5e56094e4aee36d5388d41a7
Reviewed-on: https://chromium-review.googlesource.com/450940
Commit-Ready: Dan Erat <derat@chromium.org>
Tested-by: Dan Erat <derat@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

[modify] https://crrev.com/2d5e258a83a181d56db4159ecd81c1508a817bd3/full.xml

Comment 6 by derat@chromium.org, Mar 7 2017

Status: Fixed (was: Started)

Comment 7 by dchan@google.com, May 30 2017

Labels: VerifyIn-60

Comment 8 by dchan@chromium.org, Aug 1 2017

Labels: VerifyIn-61

Comment 9 by dchan@chromium.org, Jan 22 2018

Status: Archived (was: Fixed)

Sign in to add a comment