##// END OF EJS Templates
checkheads: clarify that we no longer touch the head unknown locally...
marmoute -
r32673:bd966b9f default
parent child Browse files
Show More
@@ -340,22 +340,21 b' def checkheads(pushop):'
340 340 allfuturecommon.update(allmissing)
341 341 for branch, heads in sorted(headssum.iteritems()):
342 342 remoteheads, newheads, unsyncedheads = heads
343 candidate_newhs = set(newheads)
344 343 # add unsynced data
345 344 if remoteheads is None:
346 345 oldhs = set()
347 346 else:
348 347 oldhs = set(remoteheads)
349 348 oldhs.update(unsyncedheads)
350 candidate_newhs.update(unsyncedheads)
351 349 dhs = None # delta heads, the new heads on branch
352 350 if not repo.obsstore:
353 351 discardedheads = set()
354 newhs = candidate_newhs
352 newhs = set(newheads)
355 353 else:
356 354 newhs, discardedheads = _postprocessobsolete(pushop,
357 355 allfuturecommon,
358 candidate_newhs)
356 newheads)
357 newhs.update(unsyncedheads)
359 358 unsynced = sorted(h for h in unsyncedheads if h not in discardedheads)
360 359 if unsynced:
361 360 if None in unsynced:
General Comments 0
You need to be logged in to leave comments. Login now