changeset 1662 | 03cec5e151b2 |
parent 1661 | 48232457b704 |
child 1666 | 0e3b742f72f2 |
--- a/hgext/evolve.py Wed Sep 12 18:14:40 2012 -0400 +++ b/hgext/evolve.py Wed Sep 12 18:15:16 2012 -0400 @@ -835,7 +835,7 @@ wlock = repo.wlock() lock = repo.lock() tr = repo.transaction('rewrite') - if len(old.parents()) > 1: #XXX remove this unecessary limitation. + if len(old.parents()) > 1: #XXX remove this unnecessary limitation. raise error.Abort(_('cannot amend merge changesets')) base = old.p1() updatebookmarks = _bookmarksupdater(repo, old.node(), tr)