##// END OF EJS Templates
update: warn about other topological head in pull and unbundle...
Pierre-Yves David -
r28030:ca2a0a65 default
parent child Browse files
Show More
@@ -5542,13 +5542,17 def postincoming(ui, repo, modheads, opt
5542 if modheads == 0:
5542 if modheads == 0:
5543 return
5543 return
5544 if optupdate:
5544 if optupdate:
5545 warndest = False
5545 try:
5546 try:
5546 brev = checkout
5547 brev = checkout
5547 movemarkfrom = None
5548 movemarkfrom = None
5548 if not checkout:
5549 if not checkout:
5550 warndest = True
5549 updata = destutil.destupdate(repo)
5551 updata = destutil.destupdate(repo)
5550 checkout, movemarkfrom, brev = updata
5552 checkout, movemarkfrom, brev = updata
5551 ret = hg.update(repo, checkout)
5553 ret = hg.update(repo, checkout)
5554 if warndest:
5555 destutil.statusotherdests(ui, repo)
5552 except error.UpdateAbort as inst:
5556 except error.UpdateAbort as inst:
5553 msg = _("not updating: %s") % str(inst)
5557 msg = _("not updating: %s") % str(inst)
5554 hint = inst.hint
5558 hint = inst.hint
@@ -465,6 +465,7 Test that the internal linear merging wo
465 keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or
465 keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or
466 take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l
466 take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l
467 2 files updated, 1 files merged, 0 files removed, 0 files unresolved
467 2 files updated, 1 files merged, 0 files removed, 0 files unresolved
468 1 other heads for branch "default"
468
469
469 $ hg status -A large1
470 $ hg status -A large1
470 M large1
471 M large1
@@ -498,6 +499,7 Test that the internal linear merging wo
498 keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or
499 keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or
499 take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l
500 take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l
500 2 files updated, 1 files merged, 0 files removed, 0 files unresolved
501 2 files updated, 1 files merged, 0 files removed, 0 files unresolved
502 1 other heads for branch "default"
501
503
502 $ hg status -A large1
504 $ hg status -A large1
503 M large1
505 M large1
@@ -133,6 +133,7 Should succeed because there is only one
133 adding file changes
133 adding file changes
134 added 4 changesets with 4 changes to 1 files (+1 heads)
134 added 4 changesets with 4 changes to 1 files (+1 heads)
135 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
135 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
136 1 other heads for branch "branchA"
136
137
137 Make changes on new branch on tt
138 Make changes on new branch on tt
138
139
General Comments 0
You need to be logged in to leave comments. Login now