Show More
@@ -347,13 +347,10 b' def checkheads(pushop):' | |||||
347 | oldhs = set(remoteheads) |
|
347 | oldhs = set(remoteheads) | |
348 | oldhs.update(unsyncedheads) |
|
348 | oldhs.update(unsyncedheads) | |
349 | dhs = None # delta heads, the new heads on branch |
|
349 | dhs = None # delta heads, the new heads on branch | |
350 |
if |
|
350 | if repo.obsstore: | |
351 | discardedheads = set() |
|
351 | result = _postprocessobsolete(pushop, allfuturecommon, newheads) | |
|
352 | newheads = sorted(result[0]) | |||
352 |
|
|
353 | newhs = set(newheads) | |
353 | else: |
|
|||
354 | newhs, discardedheads = _postprocessobsolete(pushop, |
|
|||
355 | allfuturecommon, |
|
|||
356 | newheads) |
|
|||
357 | newhs.update(unsyncedheads) |
|
354 | newhs.update(unsyncedheads) | |
358 | if unsyncedheads: |
|
355 | if unsyncedheads: | |
359 | if None in unsyncedheads: |
|
356 | if None in unsyncedheads: |
General Comments 0
You need to be logged in to leave comments.
Login now