equal
deleted
inserted
replaced
978 mergedsubstate = subrepoutil.submerge(repo, pctx, wctx, wctx, |
978 mergedsubstate = subrepoutil.submerge(repo, pctx, wctx, wctx, |
979 overwrite) |
979 overwrite) |
980 files += mergedsubstate.keys() |
980 files += mergedsubstate.keys() |
981 |
981 |
982 match = scmutil.matchfiles(repo, files or []) |
982 match = scmutil.matchfiles(repo, files or []) |
983 oldtip = repo['tip'] |
983 oldtip = repo.changelog.tip() |
984 n = newcommit(repo, None, message, ph.user, ph.date, match=match, |
984 n = newcommit(repo, None, message, ph.user, ph.date, match=match, |
985 force=True) |
985 force=True) |
986 if repo['tip'] == oldtip: |
986 if repo.changelog.tip() == oldtip: |
987 raise error.Abort(_("qpush exactly duplicates child changeset")) |
987 raise error.Abort(_("qpush exactly duplicates child changeset")) |
988 if n is None: |
988 if n is None: |
989 raise error.Abort(_("repository commit failed")) |
989 raise error.Abort(_("repository commit failed")) |
990 |
990 |
991 if update_status: |
991 if update_status: |