Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/commands.py @ 3680:69cf255a55a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Indentation cleanups for 2956948b81f3.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 19 Nov 2006 16:09:04 +0100
parents 2956948b81f3
children 9c1737a3e254
comparison
equal deleted inserted replaced
3679:2956948b81f3 3680:69cf255a55a1
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