branch | stable |
changeset 16043 | 74d00b5d00cc |
parent 16040 | c0b2986b37b8 |
child 16048 | 140b6282ac79 |
--- a/hgext/mq.py Tue Jan 31 17:25:37 2012 -0600 +++ b/hgext/mq.py Tue Jan 31 23:13:04 2012 -0600 @@ -745,8 +745,11 @@ repo.dirstate.setparents(p1, merge) match = scmutil.matchfiles(repo, files or []) + oldtip = repo['tip'] n = secretcommit(repo, message, ph.user, ph.date, match=match, force=True) + if repo['tip'] == oldtip: + raise util.Abort(_("qpush exactly duplicates child changeset")) if n is None: raise util.Abort(_("repository commit failed"))