Show More
@@ -81,6 +81,8 b' class pushoperation(object):' | |||||
81 | self.outdatedphases = None |
|
81 | self.outdatedphases = None | |
82 | # phases changes that must be pushed if changeset push fails |
|
82 | # phases changes that must be pushed if changeset push fails | |
83 | self.fallbackoutdatedphases = None |
|
83 | self.fallbackoutdatedphases = None | |
|
84 | # outgoing obsmarkers | |||
|
85 | self.outobsmarkers = repo.obsstore | |||
84 |
|
86 | |||
85 | @util.propertycache |
|
87 | @util.propertycache | |
86 | def futureheads(self): |
|
88 | def futureheads(self): | |
@@ -590,7 +592,7 b' def _pushobsolete(pushop):' | |||||
590 | if (obsolete._enabled and repo.obsstore and |
|
592 | if (obsolete._enabled and repo.obsstore and | |
591 | 'obsolete' in remote.listkeys('namespaces')): |
|
593 | 'obsolete' in remote.listkeys('namespaces')): | |
592 | rslts = [] |
|
594 | rslts = [] | |
593 |
remotedata = obsolete._pushkeyescape( |
|
595 | remotedata = obsolete._pushkeyescape(pushop.outobsmarkers) | |
594 | for key in sorted(remotedata, reverse=True): |
|
596 | for key in sorted(remotedata, reverse=True): | |
595 | # reverse sort to ensure we end with dump0 |
|
597 | # reverse sort to ensure we end with dump0 | |
596 | data = remotedata[key] |
|
598 | data = remotedata[key] |
General Comments 0
You need to be logged in to leave comments.
Login now