Mercurial > hg
changeset 27088:e2b79f57903a
mergestate: add a way to record pending dirstate actions
We're going to use this in resolve in the next patch.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Fri, 20 Nov 2015 16:55:01 -0800 |
| parents | 98fc58378a3f |
| children | dbb30bc16fc2 |
| files | mercurial/merge.py |
| diffstat | 1 files changed, 5 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Sun Nov 15 21:55:46 2015 -0800 +++ b/mercurial/merge.py Fri Nov 20 16:55:01 2015 -0800 @@ -517,6 +517,11 @@ actions[action].append((f, None, "merge result")) return actions + def recordactions(self): + """record remove/add/get actions in the dirstate""" + branchmerge = self._repo.dirstate.p2() != nullid + recordupdates(self._repo, self.actions(), branchmerge) + def _checkunknownfile(repo, wctx, mctx, f, f2=None): if f2 is None: f2 = f