Mercurial > hg
view tests/test-revlog-ancestry.py.out @ 45347:1aef38d973e8
merge: pass mergeresult obj in _forgetremoved() (API)
Instead of returning a dict of actions and then updating it, let's pass the
object directly and update it there.
This makes `updateactions()` on mergeresult unused and this patch removes that.
After this patch, we have couple of methods left on mergeresult class which
still exposes the internal dict based action storage.
Differential Revision: https://phab.mercurial-scm.org/D8889
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Wed, 05 Aug 2020 16:52:51 +0530 |
parents | a60dae060bc8 |
children |
line wrap: on
line source
Ancestors of 5 4 2 0 Ancestors of 6 and 5 4 3 2 1 0 Ancestors of 5 and 4 4 2 0 Ancestors of 7, stop at 6 6 Ancestors of 7, including revs 7 6 5 4 3 2 1 0 Ancestors of 7, 5 and 3, including revs 7 6 5 4 3 2 1 0 Descendants of 5 7 8 Descendants of 5 and 3 6 7 8 Descendants of 5 and 4 5 7 8