equal
deleted
inserted
replaced
386 "'hg update' or look at 'hg heads'")) |
386 "'hg update' or look at 'hg heads'")) |
387 elif not (overwrite or branchmerge): |
387 elif not (overwrite or branchmerge): |
388 raise util.Abort(_("update spans branches, use 'hg merge' " |
388 raise util.Abort(_("update spans branches, use 'hg merge' " |
389 "or 'hg update -C' to lose changes")) |
389 "or 'hg update -C' to lose changes")) |
390 if branchmerge and not forcemerge: |
390 if branchmerge and not forcemerge: |
391 if wc.modified() or wc.added() or wc.removed(): |
391 if wc.files(): |
392 raise util.Abort(_("outstanding uncommitted changes")) |
392 raise util.Abort(_("outstanding uncommitted changes")) |
393 |
393 |
394 ### calculate phase |
394 ### calculate phase |
395 action = [] |
395 action = [] |
396 if not force: |
396 if not force: |