equal
deleted
inserted
replaced
48 |
48 |
49 def checklocalchanges(repo, force=False, excsuffix=''): |
49 def checklocalchanges(repo, force=False, excsuffix=''): |
50 cmdutil.checkunfinished(repo) |
50 cmdutil.checkunfinished(repo) |
51 s = repo.status() |
51 s = repo.status() |
52 if not force: |
52 if not force: |
|
53 if len(repo[None].parents()) > 1: |
|
54 _("outstanding uncommitted merge") #i18 tool detection |
|
55 raise error.Abort(_("outstanding uncommitted merge"+ excsuffix)) |
53 if s.modified or s.added or s.removed or s.deleted: |
56 if s.modified or s.added or s.removed or s.deleted: |
54 _("local changes found") # i18n tool detection |
57 _("local changes found") # i18n tool detection |
55 raise error.Abort(_("local changes found" + excsuffix)) |
58 raise error.Abort(_("local changes found" + excsuffix)) |
56 if checksubstate(repo): |
59 if checksubstate(repo): |
57 _("local changed subrepos found") # i18n tool detection |
60 _("local changed subrepos found") # i18n tool detection |