changeset 5820:5341d7c30e68 stable

branching: merge into stable in preparation for release # no-check-commit
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 11 Mar 2021 11:49:34 +0800
parents 87006dcf2bb7 (diff) 82040a455e71 (current diff)
children 84da58ad69a1
files hgext3rd/evolve/evolvecmd.py
diffstat 1 files changed, 0 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py	Tue Mar 09 18:50:10 2021 +0800
+++ b/hgext3rd/evolve/evolvecmd.py	Thu Mar 11 11:49:34 2021 +0800
@@ -890,7 +890,6 @@
     Each hash in the description will be detected and, if matching an obsolete
     changeset, it will be replaced by its successors.
 
-
     Note: They might be case were such behavior might be is wrong, for example
     if the commit message is explicitely referencing an older, obsolete changesets.
     """
@@ -1061,7 +1060,6 @@
         return None
     return repo.commitctx(memctx)
 
-
 def _finalizerelocate(repo, orig, dest, nodenew, tr, category, evolvestate):
     if nodenew is not None:
         obsolete.createmarkers(repo, [(orig, (repo[nodenew],))],