# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1328073184 21600
# Node ID 74d00b5d00ccc2efb26e45e2054460d0c13e1175
# Parent  4b7aa1c899dcaaef108aa5ee0b47a87769dbf07f
qpush: avoid trying to manage existing history (issue2218)

diff -r 4b7aa1c899dc -r 74d00b5d00cc hgext/mq.py
--- 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"))