Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/merge.py @ 3581:be61bd32046c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use workingcontext.files() to detect if the repo is unclean
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sun, 29 Oct 2006 14:18:55 +0100
parents 41989e55fa37
children 9bfb3c049b2a
comparison
equal deleted inserted replaced
3580:41989e55fa37 3581:be61bd32046c
390 raise util.Abort(_("outstanding uncommited changes, use " 390 raise util.Abort(_("outstanding uncommited changes, use "
391 "'hg update -C' to lose changes")) 391 "'hg update -C' to lose changes"))
392 else: 392 else:
393 overwrite = True 393 overwrite = True
394 if branchmerge and not forcemerge: 394 if branchmerge and not forcemerge:
395 if wc.modified() or wc.added() or wc.removed(): 395 if wc.files():
396 raise util.Abort(_("outstanding uncommitted changes")) 396 raise util.Abort(_("outstanding uncommitted changes"))
397 397
398 ### calculate phase 398 ### calculate phase
399 action = [] 399 action = []
400 if not force: 400 if not force: