mercurial/commands.py

2760:e6bef16b6cec

            ui.status(_('merging with changeset %s\n') % nice(op1))
            doupdate(ui, repo, hex(op1), **opts)
        else:
            ui.status(_('the backout changeset is a new head - '
                        'do not forget to merge\n'))
            ui.status(_('(use "backout -m" if you want to auto-merge)\n'))

def bundle(ui, repo, fname, dest=None, **opts):
    """create a changegroup file

    Generate a compressed changegroup file collecting all changesets

2761:0aa458261901

            ui.status(_('merging with changeset %s\n') % nice(op1))
            doupdate(ui, repo, hex(op1), **opts)
        else:
            ui.status(_('the backout changeset is a new head - '
                        'do not forget to merge\n'))
            ui.status(_('(use "backout --merge" '
                        'if you want to auto-merge)\n'))

def bundle(ui, repo, fname, dest=None, **opts):
    """create a changegroup file

    Generate a compressed changegroup file collecting all changesets