Show More
@@ -244,7 +244,7 b' def _oldheadssummary(repo, remoteheads, ' | |||
|
244 | 244 | # Construct {old,new}map with branch = None (topological branch). |
|
245 | 245 | # (code based on update) |
|
246 | 246 | knownnode = repo.changelog.hasnode # no nodemap until it is filtered |
|
247 |
oldheads = s |
|
|
247 | oldheads = list(h for h in remoteheads if knownnode(h)) | |
|
248 | 248 | # all nodes in outgoing.missing are children of either: |
|
249 | 249 | # - an element of oldheads |
|
250 | 250 | # - another element of outgoing.missing |
@@ -254,9 +254,9 b' def _oldheadssummary(repo, remoteheads, ' | |||
|
254 | 254 | newheads = list(c.node() for c in r) |
|
255 | 255 | # set some unsynced head to issue the "unsynced changes" warning |
|
256 | 256 | if inc: |
|
257 |
unsynced = |
|
|
257 | unsynced = [None] | |
|
258 | 258 | else: |
|
259 |
unsynced = |
|
|
259 | unsynced = [] | |
|
260 | 260 | return {None: (oldheads, newheads, unsynced)} |
|
261 | 261 | |
|
262 | 262 | def _nowarnheads(pushop): |
General Comments 0
You need to be logged in to leave comments.
Login now