Merge "_CopyAndLinkFiles even if the sources haven't changed"

This commit is contained in:
Dan Willemsen 2015-09-09 20:47:19 +00:00 committed by Gerrit Code Review
commit c32ba1961e

View File

@ -1275,6 +1275,8 @@ class Project(object):
# Except if the head needs to be detached # Except if the head needs to be detached
# #
if not syncbuf.detach_head: if not syncbuf.detach_head:
# The copy/linkfile config may have changed.
self._CopyAndLinkFiles()
return return
else: else:
lost = self._revlist(not_rev(revid), HEAD) lost = self._revlist(not_rev(revid), HEAD)
@ -1292,6 +1294,8 @@ class Project(object):
if head == revid: if head == revid:
# No changes; don't do anything further. # No changes; don't do anything further.
# #
# The copy/linkfile config may have changed.
self._CopyAndLinkFiles()
return return
branch = self.GetBranch(branch) branch = self.GetBranch(branch)