diff options
Diffstat (limited to 'project.py')
| -rw-r--r-- | project.py | 8 |
1 files changed, 5 insertions, 3 deletions
| @@ -1442,10 +1442,12 @@ class MetaProject(Project): | |||
| 1442 | if self.Exists: | 1442 | if self.Exists: |
| 1443 | cb = self.CurrentBranch | 1443 | cb = self.CurrentBranch |
| 1444 | if cb: | 1444 | if cb: |
| 1445 | base = self.GetBranch(cb).merge | 1445 | cb = self.GetBranch(cb) |
| 1446 | if base: | 1446 | if cb.merge: |
| 1447 | self.revisionExpr = base | 1447 | self.revisionExpr = cb.merge |
| 1448 | self.revisionId = None | 1448 | self.revisionId = None |
| 1449 | if cb.remote and cb.remote.name: | ||
| 1450 | self.remote.name = cb.remote.name | ||
| 1449 | 1451 | ||
| 1450 | @property | 1452 | @property |
| 1451 | def LastFetch(self): | 1453 | def LastFetch(self): |
