Mercurial > hg
comparison tests/test-revlog-ancestry.py @ 27344:43c00ca887d1
merge: have merge.update use a matcher instead of partial fn
This is relatively rarely used functionality, but migrating this to a
matcher will make future work on narrow clones more feasible.
author | Augie Fackler <augie@google.com> |
---|---|
date | Mon, 14 Dec 2015 18:54:03 -0500 |
parents | f88c60e740a1 |
children | abe605bbf0de |
comparison
equal
deleted
inserted
replaced
27343:c59647c6694d | 27344:43c00ca887d1 |
---|---|
15 f.close() | 15 f.close() |
16 repo[None].add([name]) | 16 repo[None].add([name]) |
17 commit(name, time) | 17 commit(name, time) |
18 | 18 |
19 def update(rev): | 19 def update(rev): |
20 merge.update(repo, rev, False, True, False) | 20 merge.update(repo, rev, False, True) |
21 | 21 |
22 def merge_(rev): | 22 def merge_(rev): |
23 merge.update(repo, rev, True, False, False) | 23 merge.update(repo, rev, True, False) |
24 | 24 |
25 if __name__ == '__main__': | 25 if __name__ == '__main__': |
26 addcommit("A", 0) | 26 addcommit("A", 0) |
27 addcommit("B", 1) | 27 addcommit("B", 1) |
28 | 28 |
80 print r, | 80 print r, |
81 | 81 |
82 print '\nDescendants of 5 and 4' | 82 print '\nDescendants of 5 and 4' |
83 for r in repo.changelog.descendants([5, 4]): | 83 for r in repo.changelog.descendants([5, 4]): |
84 print r, | 84 print r, |
85 |