Mercurial > public > mercurial-scm > hg
comparison mercurial/policy.py @ 39452:481db51c83e9
merge with stable
Includes an extra bump of the version number for parsers because the
merge produces a new, distinct version of the code.
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Wed, 05 Sep 2018 09:36:31 -0700 |
| parents | 7a759ad2d06d adacefb0b7ea |
| children | f2342483f7a6 |
comparison
equal
deleted
inserted
replaced
| 39451:5bfab9400daf | 39452:481db51c83e9 |
|---|---|
| 67 _cextversions = { | 67 _cextversions = { |
| 68 (r'cext', r'base85'): 1, | 68 (r'cext', r'base85'): 1, |
| 69 (r'cext', r'bdiff'): 3, | 69 (r'cext', r'bdiff'): 3, |
| 70 (r'cext', r'mpatch'): 1, | 70 (r'cext', r'mpatch'): 1, |
| 71 (r'cext', r'osutil'): 4, | 71 (r'cext', r'osutil'): 4, |
| 72 (r'cext', r'parsers'): 9, | 72 (r'cext', r'parsers'): 11, |
| 73 } | 73 } |
| 74 | 74 |
| 75 # map import request to other package or module | 75 # map import request to other package or module |
| 76 _modredirects = { | 76 _modredirects = { |
| 77 (r'cext', r'charencode'): (r'cext', r'parsers'), | 77 (r'cext', r'charencode'): (r'cext', r'parsers'), |