##// END OF EJS Templates
qpush: avoid trying to manage existing history (issue2218)
Matt Mackall -
r16043:74d00b5d stable
parent child Browse files
Show More
@@ -745,8 +745,11 b' class queue(object):'
745 repo.dirstate.setparents(p1, merge)
745 repo.dirstate.setparents(p1, merge)
746
746
747 match = scmutil.matchfiles(repo, files or [])
747 match = scmutil.matchfiles(repo, files or [])
748 oldtip = repo['tip']
748 n = secretcommit(repo, message, ph.user, ph.date, match=match,
749 n = secretcommit(repo, message, ph.user, ph.date, match=match,
749 force=True)
750 force=True)
751 if repo['tip'] == oldtip:
752 raise util.Abort(_("qpush exactly duplicates child changeset"))
750 if n is None:
753 if n is None:
751 raise util.Abort(_("repository commit failed"))
754 raise util.Abort(_("repository commit failed"))
752
755
General Comments 0
You need to be logged in to leave comments. Login now