Show More
@@ -2107,6 +2107,7 b' class localrepository(object):' | |||||
2107 | # accessing the 'ser ved' branchmap should refresh all the others, |
|
2107 | # accessing the 'ser ved' branchmap should refresh all the others, | |
2108 | self.ui.debug('updating the branch cache\n') |
|
2108 | self.ui.debug('updating the branch cache\n') | |
2109 | self.filtered('served').branchmap() |
|
2109 | self.filtered('served').branchmap() | |
|
2110 | self.filtered('served.hidden').branchmap() | |||
2110 |
|
2111 | |||
2111 | if full: |
|
2112 | if full: | |
2112 | unfi = self.unfiltered() |
|
2113 | unfi = self.unfiltered() |
@@ -330,6 +330,7 b' Check that the right ancestors is used w' | |||||
330 | bundle2-input-bundle: 2 parts total |
|
330 | bundle2-input-bundle: 2 parts total | |
331 | updating the branch cache |
|
331 | updating the branch cache | |
332 | invalid branchheads cache (served): tip differs |
|
332 | invalid branchheads cache (served): tip differs | |
|
333 | invalid branchheads cache (served.hidden): tip differs | |||
333 | rebase completed |
|
334 | rebase completed | |
334 |
|
335 | |||
335 | Test minimization of merge conflicts |
|
336 | Test minimization of merge conflicts |
General Comments 0
You need to be logged in to leave comments.
Login now