Skip to content

erp5_fork
erp5_fork
Commit c7a53601 authored by Julien Muchembled's avatar Julien Muchembled
Browse files
Options

erp5testnode: fix previous commit

parent bd2050e0
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
erp5/util/testnode/Updater.py
View file @ c7a53601
...@@ -201,6 +201,7 @@ class Updater(object): ...@@ -201,6 +201,7 @@ class Updater(object):
self._git('svn', 'rebase') self._git('svn', 'rebase')
else: else:
self._git('fetch') self._git('fetch')
self._git('update-index', '--refresh') # see note above
self._git('reset', '--merge', '@{u}') self._git('reset', '--merge', '@{u}')
self.revision = self._git_find_rev(self._git('rev-parse', 'HEAD')) self.revision = self._git_find_rev(self._git('rev-parse', 'HEAD'))
elif self.getRepositoryType() == SVN_TYPE: elif self.getRepositoryType() == SVN_TYPE:
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7