commit c5f15bf7c0e0d84a319c5d8d7cb8260f28f7fe9c
author Dan Willemsen <dwillemsen@google.com> Wed Aug 19 17:53:28 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 19 17:53:28 2015 +0000
tree 91f6221bf7318ab803cdc4711be0667ebdb40d69
parent 6d35d676dbaadd96b785f188cf04563bf1165831
parent f9b7683a3bf979d6cef50d691165280d64566ee4

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

project.py

diff --git a/project.py b/project.py
index a117f4d..82fa848 100644
--- a/project.py
+++ b/project.py
@@ -2320,7 +2320,10 @@
         # Fail if the links are pointing to the wrong place
         if src != dst:
           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):
     """Update |dotgit| to reference |gitdir|, using symlinks where possible.