Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/merge.py @ 2899:bee4b7abcb01

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew
author Matt Mackall <mpm@selenic.com>
date Mon, 14 Aug 2006 14:42:15 -0500
parents 06c05c675a35 3d6efcbbd1c9
children 95cc73523983
comparison
equal deleted inserted replaced
2898:06c05c675a35 2899:bee4b7abcb01
73 73
74 if not overwrite and not linear_path and not branchmerge: 74 if not overwrite and not linear_path and not branchmerge:
75 raise util.Abort(_("update spans branches, use 'hg merge' " 75 raise util.Abort(_("update spans branches, use 'hg merge' "
76 "or 'hg update -C' to lose changes")) 76 "or 'hg update -C' to lose changes"))
77 77
78 modified, added, removed, deleted, unknown = repo.changes() 78 modified, added, removed, deleted, unknown = repo.status()[:5]
79 if branchmerge and not forcemerge: 79 if branchmerge and not forcemerge:
80 if modified or added or removed: 80 if modified or added or removed:
81 raise util.Abort(_("outstanding uncommitted changes")) 81 raise util.Abort(_("outstanding uncommitted changes"))
82 82
83 m1n = repo.changelog.read(p1)[0] 83 m1n = repo.changelog.read(p1)[0]