##// END OF EJS Templates
discovery: put trivial branch first...
Pierre-Yves David -
r26603:517ffec3 default
parent child Browse files
Show More
@@ -305,7 +305,9 b' def checkheads(repo, remote, outgoing, r'
305 candidate_newhs.update(unsyncedheads)
305 candidate_newhs.update(unsyncedheads)
306 dhs = None # delta heads, the new heads on branch
306 dhs = None # delta heads, the new heads on branch
307 discardedheads = set()
307 discardedheads = set()
308 if repo.obsstore:
308 if not repo.obsstore:
309 newhs = candidate_newhs
310 else:
309 # remove future heads which are actually obsoleted by another
311 # remove future heads which are actually obsoleted by another
310 # pushed element:
312 # pushed element:
311 #
313 #
@@ -334,8 +336,6 b' def checkheads(repo, remote, outgoing, r'
334 break
336 break
335 else:
337 else:
336 newhs.add(nh)
338 newhs.add(nh)
337 else:
338 newhs = candidate_newhs
339 unsynced = sorted(h for h in unsyncedheads if h not in discardedheads)
339 unsynced = sorted(h for h in unsyncedheads if h not in discardedheads)
340 if unsynced:
340 if unsynced:
341 if None in unsynced:
341 if None in unsynced:
General Comments 0
You need to be logged in to leave comments. Login now