Show More
@@ -938,7 +938,7 b' def backout(ui, repo, rev, **opts):' | |||||
938 | if op1 != node: |
|
938 | if op1 != node: | |
939 | if opts['merge']: |
|
939 | if opts['merge']: | |
940 | ui.status(_('merging with changeset %s\n') % nice(op1)) |
|
940 | ui.status(_('merging with changeset %s\n') % nice(op1)) | |
941 |
doupdate(ui, repo, hex(op1), |
|
941 | doupdate(ui, repo, hex(op1), merge=True) | |
942 | else: |
|
942 | else: | |
943 | ui.status(_('the backout changeset is a new head - ' |
|
943 | ui.status(_('the backout changeset is a new head - ' | |
944 | 'do not forget to merge\n')) |
|
944 | 'do not forget to merge\n')) | |
@@ -2826,7 +2826,7 b' def undo(ui, repo):' | |||||
2826 | repo.rollback() |
|
2826 | repo.rollback() | |
2827 |
|
2827 | |||
2828 | def update(ui, repo, node=None, merge=False, clean=False, force=None, |
|
2828 | def update(ui, repo, node=None, merge=False, clean=False, force=None, | |
2829 |
branch=None |
|
2829 | branch=None): | |
2830 | """update or merge working directory |
|
2830 | """update or merge working directory | |
2831 |
|
2831 | |||
2832 | Update the working directory to the specified revision. |
|
2832 | Update the working directory to the specified revision. | |
@@ -2844,10 +2844,10 b' def update(ui, repo, node=None, merge=Fa' | |||||
2844 | if merge: |
|
2844 | if merge: | |
2845 | ui.warn(_('(the -m/--merge option is deprecated; ' |
|
2845 | ui.warn(_('(the -m/--merge option is deprecated; ' | |
2846 | 'use the merge command instead)\n')) |
|
2846 | 'use the merge command instead)\n')) | |
2847 |
return doupdate(ui, repo, node, merge, clean, force, branch |
|
2847 | return doupdate(ui, repo, node, merge, clean, force, branch) | |
2848 |
|
2848 | |||
2849 | def doupdate(ui, repo, node=None, merge=False, clean=False, force=None, |
|
2849 | def doupdate(ui, repo, node=None, merge=False, clean=False, force=None, | |
2850 |
branch=None |
|
2850 | branch=None): | |
2851 | if branch: |
|
2851 | if branch: | |
2852 | br = repo.branchlookup(branch=branch) |
|
2852 | br = repo.branchlookup(branch=branch) | |
2853 | found = [] |
|
2853 | found = [] | |
@@ -2857,7 +2857,7 b' def doupdate(ui, repo, node=None, merge=' | |||||
2857 | if len(found) > 1: |
|
2857 | if len(found) > 1: | |
2858 | ui.warn(_("Found multiple heads for %s\n") % branch) |
|
2858 | ui.warn(_("Found multiple heads for %s\n") % branch) | |
2859 | for x in found: |
|
2859 | for x in found: | |
2860 |
show_changeset(ui, repo, |
|
2860 | show_changeset(ui, repo, {}).show(changenode=x, brinfo=br) | |
2861 | return 1 |
|
2861 | return 1 | |
2862 | if len(found) == 1: |
|
2862 | if len(found) == 1: | |
2863 | node = found[0] |
|
2863 | node = found[0] |
General Comments 0
You need to be logged in to leave comments.
Login now