summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2015-09-09 20:47:19 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-09-09 20:47:19 +0000
commitc32ba1961e3451101ce94a26f83cf56681ff6414 (patch)
tree208afccd01c6a238acf73d0701c11ca4411686f9
parent250303b437855c2b50d052a05a08ed517423af8b (diff)
parent029eaf3bac39d0dce49e0627597b1659d5335dde (diff)
downloadgit-repo-c32ba1961e3451101ce94a26f83cf56681ff6414.tar.gz
Merge "_CopyAndLinkFiles even if the sources haven't changed"v1.12.30
-rw-r--r--project.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/project.py b/project.py
index f964b2fc..5d8f61e1 100644
--- a/project.py
+++ b/project.py
@@ -1275,6 +1275,8 @@ class Project(object):
1275 # Except if the head needs to be detached 1275 # Except if the head needs to be detached
1276 # 1276 #
1277 if not syncbuf.detach_head: 1277 if not syncbuf.detach_head:
1278 # The copy/linkfile config may have changed.
1279 self._CopyAndLinkFiles()
1278 return 1280 return
1279 else: 1281 else:
1280 lost = self._revlist(not_rev(revid), HEAD) 1282 lost = self._revlist(not_rev(revid), HEAD)
@@ -1292,6 +1294,8 @@ class Project(object):
1292 if head == revid: 1294 if head == revid:
1293 # No changes; don't do anything further. 1295 # No changes; don't do anything further.
1294 # 1296 #
1297 # The copy/linkfile config may have changed.
1298 self._CopyAndLinkFiles()
1295 return 1299 return
1296 1300
1297 branch = self.GetBranch(branch) 1301 branch = self.GetBranch(branch)