equal
deleted
inserted
replaced
212 raise util.Abort(_('cannot back out a merge changeset without ' |
212 raise util.Abort(_('cannot back out a merge changeset without ' |
213 '--parent')) |
213 '--parent')) |
214 p = repo.lookup(opts['parent']) |
214 p = repo.lookup(opts['parent']) |
215 if p not in (p1, p2): |
215 if p not in (p1, p2): |
216 raise util.Abort(_('%s is not a parent of %s') % |
216 raise util.Abort(_('%s is not a parent of %s') % |
217 (short(p), short(node))) |
217 (short(p), short(node))) |
218 parent = p |
218 parent = p |
219 else: |
219 else: |
220 if opts['parent']: |
220 if opts['parent']: |
221 raise util.Abort(_('cannot use --parent on non-merge changeset')) |
221 raise util.Abort(_('cannot use --parent on non-merge changeset')) |
222 parent = p1 |
222 parent = p1 |