Mercurial > evolve
changeset 4546:e7b44e9c38d2 stable
compat: fix a typo in compat patch
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Fri, 19 Apr 2019 10:31:53 +0530 |
| parents | 93c6a274cd83 |
| children | bdcea921d28b 093df66127ec |
| files | CHANGELOG hgext3rd/evolve/compat.py |
| diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/CHANGELOG Thu Apr 18 23:51:13 2019 +0200 +++ b/CHANGELOG Fri Apr 19 10:31:53 2019 +0530 @@ -4,8 +4,9 @@ 8.5.1 - in progress ------------------- - * topic: compatibility with mercurial-5.0 - * topic: improve extensions isolation (issue6121) + * evolve: make sure we use upstream merge code with 5.0, + * topic: compatibility with mercurial-5.0, + * topic: improve extensions isolation (issue6121). 8.5.0 -- 2019-04-23 -------------------
--- a/hgext3rd/evolve/compat.py Thu Apr 18 23:51:13 2019 +0200 +++ b/hgext3rd/evolve/compat.py Fri Apr 19 10:31:53 2019 +0530 @@ -418,7 +418,7 @@ return copy, movewithdir, diverge, renamedelete, dirmove # hg <= 4.9 compat (7694b685bb10) -fixupstreamed = util.safehasattr(scmutil, '_movedirstate') +fixupstreamed = util.safehasattr(scmutil, 'movedirstate') if not fixupstreamed: copies._fullcopytracing = fixedcopytracing