Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/merge.py @ 2874:3d6efcbbd1c9
remove localrepository.changes.
use localrepository.status instead.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Sat, 12 Aug 2006 16:40:12 -0700 |
parents | b11c014dcbd9 |
children | bee4b7abcb01 |
line wrap: on
line diff
--- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -75,7 +75,7 @@ def update(repo, node, branchmerge=False raise util.Abort(_("update spans branches, use 'hg merge' " "or 'hg update -C' to lose changes")) - modified, added, removed, deleted, unknown = repo.changes() + modified, added, removed, deleted, unknown = repo.status()[:5] if branchmerge and not forcemerge: if modified or added or removed: raise util.Abort(_("outstanding uncommitted changes"))