equal
deleted
inserted
replaced
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), **opts) |
941 doupdate(ui, repo, hex(op1), **opts) |
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')) |
945 ui.status(_('(use "backout -m" if you want to auto-merge)\n')) |
945 ui.status(_('(use "backout --merge" ' |
|
946 'if you want to auto-merge)\n')) |
946 |
947 |
947 def bundle(ui, repo, fname, dest=None, **opts): |
948 def bundle(ui, repo, fname, dest=None, **opts): |
948 """create a changegroup file |
949 """create a changegroup file |
949 |
950 |
950 Generate a compressed changegroup file collecting all changesets |
951 Generate a compressed changegroup file collecting all changesets |