Mercurial > hg
diff 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 |
line wrap: on
line diff
--- a/mercurial/policy.py Thu Jul 13 23:43:16 2017 -0700 +++ b/mercurial/policy.py Tue May 16 11:00:38 2017 -0700 @@ -69,7 +69,7 @@ (r'cext', r'bdiff'): 3, (r'cext', r'mpatch'): 1, (r'cext', r'osutil'): 4, - (r'cext', r'parsers'): 12, + (r'cext', r'parsers'): 13, } # map import request to other package or module