Mercurial > evolve

changeset 5557:ca45afafd94f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: update some comments
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Mon, 31 Aug 2020 15:34:12 +0530
parents 1bb1d36e1bc2
children 5f2c85ea8b33
files hgext3rd/evolve/evolvecmd.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py	Thu Aug 13 13:30:25 2020 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Mon Aug 31 15:34:12 2020 +0530
@@ -1986,7 +1986,7 @@
                 evolvestate[b'temprevs'].append(newother)
                 evolvestate[b'other-divergent'] = newother
                 other = repo[newother]
-            # continue the resolution by merging the content-divergence
+            # continue the resolution by merging the content-divergent csets
             _mergecontentdivergents(repo, progresscb, divergent, other,
                                     base, evolvestate)
 
@@ -2001,7 +2001,7 @@
             evolvestate[b'temprevs'].append(newother)
             evolvestate[b'other-divergent'] = newother
             other = repo[newother]
-            # continue the resolution by merging the content-divergence
+            # continue the resolution by merging the content-divergent csets
             _mergecontentdivergents(repo, progresscb, divergent,
                                     other, base, evolvestate)