Mercurial > public > mercurial-scm > hg-stable
diff mercurial/localrepo.py @ 10969:ca052b484e56
context: remove parents parameter to workingctx
it was needed before the refactor of commit, workingctx always uses the
dirstate now.
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Wed, 21 Apr 2010 01:18:31 +0200 |
| parents | ca739acf1a98 |
| children | 3213e8947975 |
line wrap: on
line diff
--- a/mercurial/localrepo.py Tue Apr 20 11:17:01 2010 +0200 +++ b/mercurial/localrepo.py Wed Apr 21 01:18:31 2010 +0200 @@ -852,8 +852,7 @@ raise util.Abort(_("unresolved merge conflicts " "(see hg resolve)")) - cctx = context.workingctx(self, (p1, p2), text, user, date, - extra, changes) + cctx = context.workingctx(self, text, user, date, extra, changes) if editor: cctx._text = editor(self, cctx, subs) edited = (text != cctx._text)