Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
erp5_rtl_support
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Romain Courteaud
erp5_rtl_support
Commits
bd2050e0
Commit
bd2050e0
authored
Nov 03, 2011
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5testnode: fix possible error when updating Git working copy
parent
1e0e1bfe
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
0 deletions
+6
-0
erp5/util/testnode/Updater.py
erp5/util/testnode/Updater.py
+6
-0
No files found.
erp5/util/testnode/Updater.py
View file @
bd2050e0
...
@@ -188,6 +188,12 @@ class Updater(object):
...
@@ -188,6 +188,12 @@ class Updater(object):
h = revision[1]
h = revision[1]
if h != self._git('
rev
-
parse
', '
HEAD
'):
if h != self._git('
rev
-
parse
', '
HEAD
'):
self.deletePycFiles('
.
')
self.deletePycFiles('
.
')
# For performance reasons, '
reset
--
merge
' only looks at mtime & ctime
# to check is the index is correct and conflicts immediately if
# contents or metadata changed. Even hardlinking a file changes its
# ctime, so at least for buildout (local download), we need to
# refresh index first.
self._git('
update
-
index
', '
--
refresh
')
self._git('
reset
', '
--
merge
', h)
self._git('
reset
', '
--
merge
', h)
else:
else:
self.deletePycFiles('
.
')
self.deletePycFiles('
.
')
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment