##// END OF EJS Templates
commit: correctly check commit mutability during commit --amend...
Augie Fackler -
r22417:ca854cd4 default
parent child Browse files
Show More
@@ -1409,7 +1409,7 b' def commit(ui, repo, *pats, **opts):'
1409 raise util.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1409 raise util.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1410
1410
1411 old = repo['.']
1411 old = repo['.']
1412 if old.phase() == phases.public:
1412 if not old.mutable():
1413 raise util.Abort(_('cannot amend public changesets'))
1413 raise util.Abort(_('cannot amend public changesets'))
1414 if len(repo[None].parents()) > 1:
1414 if len(repo[None].parents()) > 1:
1415 raise util.Abort(_('cannot amend while merging'))
1415 raise util.Abort(_('cannot amend while merging'))
General Comments 0
You need to be logged in to leave comments. Login now