diff options
author | Dan Willemsen <dwillemsen@google.com> | 2015-08-19 17:53:28 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-08-19 17:53:28 +0000 |
commit | c5f15bf7c0e0d84a319c5d8d7cb8260f28f7fe9c (patch) | |
tree | 91f6221bf7318ab803cdc4711be0667ebdb40d69 | |
parent | 6d35d676dbaadd96b785f188cf04563bf1165831 (diff) | |
parent | f9b7683a3bf979d6cef50d691165280d64566ee4 (diff) | |
download | git-repo-c5f15bf7c0e0d84a319c5d8d7cb8260f28f7fe9c.tar.gz |
Merge "Include project path in --force-sync error message"
-rw-r--r-- | project.py | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -2320,7 +2320,10 @@ class Project(object): | |||
2320 | # Fail if the links are pointing to the wrong place | 2320 | # Fail if the links are pointing to the wrong place |
2321 | if src != dst: | 2321 | if src != dst: |
2322 | raise GitError('--force-sync not enabled; cannot overwrite a local ' | 2322 | raise GitError('--force-sync not enabled; cannot overwrite a local ' |
2323 | 'work tree') | 2323 | 'work tree. If you\'re comfortable with the ' |
2324 | 'possibility of losing the work tree\'s git metadata,' | ||
2325 | ' use `repo sync --force-sync {0}` to ' | ||
2326 | 'proceed.'.format(self.relpath)) | ||
2324 | 2327 | ||
2325 | def _ReferenceGitDir(self, gitdir, dotgit, share_refs, copy_all): | 2328 | def _ReferenceGitDir(self, gitdir, dotgit, share_refs, copy_all): |
2326 | """Update |dotgit| to reference |gitdir|, using symlinks where possible. | 2329 | """Update |dotgit| to reference |gitdir|, using symlinks where possible. |