##// END OF EJS Templates
discovery: process heads in sorted order
Mads Kiilerich -
r18361:06f07583 default
parent child Browse files
Show More
@@ -268,7 +268,7 b' def checkheads(repo, remote, outgoing, r'
268 268 allmissing = set(outgoing.missing)
269 269 allfuturecommon = set(c.node() for c in repo.set('%ld', outgoing.common))
270 270 allfuturecommon.update(allmissing)
271 for branch, heads in headssum.iteritems():
271 for branch, heads in sorted(headssum.iteritems()):
272 272 if heads[0] is None:
273 273 # Maybe we should abort if we push more that one head
274 274 # for new branches ?
@@ -312,7 +312,7 b' def checkheads(repo, remote, outgoing, r'
312 312 unsynced = True
313 313 if len(newhs) > len(oldhs):
314 314 # strip updates to existing remote heads from the new heads list
315 dhs = list(newhs - bookmarkedheads - oldhs)
315 dhs = sorted(newhs - bookmarkedheads - oldhs)
316 316 if dhs:
317 317 if error is None:
318 318 if branch not in ('default', None):
@@ -457,7 +457,7 b' Prepush -r should not allow you to sneak'
457 457 $ hg push ../l -b b
458 458 pushing to ../l
459 459 searching for changes
460 abort: push creates new remote head e7e31d71180f on branch 'a'!
460 abort: push creates new remote head 451211cc22b0 on branch 'a'!
461 461 (did you forget to merge? use push -f to force)
462 462 [255]
463 463
General Comments 0
You need to be logged in to leave comments. Login now