mercurial/commands.py

29028:67fd250b7c21

                # write out state for --continue
                nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
                repo.vfs.write('graftstate', ''.join(nodelines))
                extra = ''
                if opts.get('user'):
                    extra += ' --user %s' % opts['user']
                if opts.get('date'):
                    extra += ' --date %s' % opts['date']
                if opts.get('log'):
                    extra += ' --log'
                hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
                raise error.Abort(
                    _("unresolved conflicts, can't continue"),

29029:224dd889ecd0

                # write out state for --continue
                nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
                repo.vfs.write('graftstate', ''.join(nodelines))
                extra = ''
                if opts.get('user'):
                    extra += ' --user %s' % util.shellquote(opts['user'])
                if opts.get('date'):
                    extra += ' --date %s' % util.shellquote(opts['date'])
                if opts.get('log'):
                    extra += ' --log'
                hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
                raise error.Abort(
                    _("unresolved conflicts, can't continue"),