equal
deleted
inserted
replaced
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] |