Mercurial > public > mercurial-scm > hg
comparison mercurial/policy.py @ 42343:d8e55c0c642c
util: make util.dirs() and util.finddirs() include root directory (API)
This changes the behavior of test-origbackup-conflict.t so it no
longer errors out when the backup path points to an existing
file. Instead, it replaces the file by a directory. That seems
reasonable to me.
Differential Revision: https://phab.mercurial-scm.org/D6403
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 16 May 2017 11:00:38 -0700 |
| parents | f2342483f7a6 |
| children | 810f66b468cd |
comparison
equal
deleted
inserted
replaced
| 42342:448486e12c13 | 42343:d8e55c0c642c |
|---|---|
| 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'): 12, | 72 (r'cext', r'parsers'): 13, |
| 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'), |