Mercurial > hg

changeset 16043:74d00b5d00cc stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qpush: avoid trying to manage existing history (issue2218)
author Matt Mackall <mpm@selenic.com>
date Tue, 31 Jan 2012 23:13:04 -0600
parents 4b7aa1c899dc
children 140b6282ac79
files hgext/mq.py
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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"))