Mercurial > hg
diff mercurial/ancestor.py @ 33867:252fb66ee5bb
copies: use intersectmatchers() in non-merge p1 optimization
This enables the optimization introduced by d4247c306d82 for non-rebase cases.
Before, the match couldn't be narrowed if it was e.g. alwaysmatcher.
The logic is copied from bd56bea5ecf8.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sat, 19 Aug 2017 11:23:33 +0900 |
parents | bd872f64a8ba |
children | f8b46245b26a |