Commit 4765dfa3 authored by Nicolas Delaby's avatar Nicolas Delaby

Display verbose message to developer

This message explain why VCSTool is not able to update a working copy
with local commits, because conflict resolution is not implemented.
parent c6f935e7
...@@ -264,7 +264,8 @@ class Git(WorkingCopy): ...@@ -264,7 +264,8 @@ class Git(WorkingCopy):
def update(self, keep=False): def update(self, keep=False):
if self.getAheadCount(): if self.getAheadCount():
raise NotImplementedError raise NotImplementedError("I don't know how to update a working copy"\
"with local commits")
if not keep: if not keep:
self.clean() self.clean()
self.remote_git('pull', '--ff-only') self.remote_git('pull', '--ff-only')
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment