Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 5716:be367cbafe70

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cmdutil: make bail_if_changed bail on uncommitted merge
author Matt Mackall <mpm@selenic.com>
date Thu, 27 Dec 2007 23:55:39 -0600
parents 883d887c6408
children 8ee0de123989
comparison
equal deleted inserted replaced
5715:d280774a7498 5716:be367cbafe70
194 194
195 if not rev: 195 if not rev:
196 raise util.Abort(_("please specify a revision to backout")) 196 raise util.Abort(_("please specify a revision to backout"))
197 197
198 cmdutil.bail_if_changed(repo) 198 cmdutil.bail_if_changed(repo)
199 node = repo.lookup(rev)
200
199 op1, op2 = repo.dirstate.parents() 201 op1, op2 = repo.dirstate.parents()
200 if op2 != nullid:
201 raise util.Abort(_('outstanding uncommitted merge'))
202 node = repo.lookup(rev)
203
204 a = repo.changelog.ancestor(op1, node) 202 a = repo.changelog.ancestor(op1, node)
205 if a != node: 203 if a != node:
206 raise util.Abort(_('cannot back out change on a different branch')) 204 raise util.Abort(_('cannot back out change on a different branch'))
207 205
208 p1, p2 = repo.changelog.parents(node) 206 p1, p2 = repo.changelog.parents(node)