equal
deleted
inserted
replaced
4229 # write out state for --continue |
4229 # write out state for --continue |
4230 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]] |
4230 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]] |
4231 repo.vfs.write('graftstate', ''.join(nodelines)) |
4231 repo.vfs.write('graftstate', ''.join(nodelines)) |
4232 extra = '' |
4232 extra = '' |
4233 if opts.get('user'): |
4233 if opts.get('user'): |
4234 extra += ' --user %s' % opts['user'] |
4234 extra += ' --user %s' % util.shellquote(opts['user']) |
4235 if opts.get('date'): |
4235 if opts.get('date'): |
4236 extra += ' --date %s' % opts['date'] |
4236 extra += ' --date %s' % util.shellquote(opts['date']) |
4237 if opts.get('log'): |
4237 if opts.get('log'): |
4238 extra += ' --log' |
4238 extra += ' --log' |
4239 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra |
4239 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra |
4240 raise error.Abort( |
4240 raise error.Abort( |
4241 _("unresolved conflicts, can't continue"), |
4241 _("unresolved conflicts, can't continue"), |