Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
compat: fix a typo in compat patch stable
authorSushil khanchi <sushilkhanchi97@gmail.com>
Fri, 19 Apr 2019 10:31:53 +0530
branchstable
changeset 4546 e7b44e9c38d2
parent 4545 93c6a274cd83
child 4547 bdcea921d28b
child 4554 093df66127ec
compat: fix a typo in compat patch
CHANGELOG file | annotate | diff | comparison | revisions
hgext3rd/evolve/compat.py file | annotate | diff | comparison | revisions 
--- 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
evolve