android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2025-01-06 16:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Include project path in --force-sync error message"

Browse Source
This commit is contained in:
Dan Willemsen 2015-08-19 17:53:28 +00:00 committed by Gerrit Code Review
commit c5f15bf7c0
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
project.py
View File

@ -2320,7 +2320,10 @@ class Project(object):
# Fail if the links are pointing to the wrong place # Fail if the links are pointing to the wrong place
if src != dst: if src != dst:
raise GitError('--force-sync not enabled; cannot overwrite a local ' raise GitError('--force-sync not enabled; cannot overwrite a local '
'work tree') 'work tree. If you\'re comfortable with the '
'possibility of losing the work tree\'s git metadata,'
' use `repo sync --force-sync {0}` to '
'proceed.'.format(self.relpath))
def _ReferenceGitDir(self, gitdir, dotgit, share_refs, copy_all): def _ReferenceGitDir(self, gitdir, dotgit, share_refs, copy_all):
"""Update |dotgit| to reference |gitdir|, using symlinks where possible. """Update |dotgit| to reference |gitdir|, using symlinks where possible.