Mercurial > hg
comparison hgext/mq.py @ 16043:74d00b5d00cc stable
qpush: avoid trying to manage existing history (issue2218)
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 31 Jan 2012 23:13:04 -0600 |
| parents | c0b2986b37b8 |
| children | 140b6282ac79 |
comparison
equal
deleted
inserted
replaced
| 16042:4b7aa1c899dc | 16043:74d00b5d00cc |
|---|---|
| 743 repo.dirstate.merge(f) | 743 repo.dirstate.merge(f) |
| 744 p1, p2 = repo.dirstate.parents() | 744 p1, p2 = repo.dirstate.parents() |
| 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 |
| 753 if update_status: | 756 if update_status: |
| 754 self.applied.append(statusentry(n, patchname)) | 757 self.applied.append(statusentry(n, patchname)) |