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