Mercurial > evolve

changeset 4726:24e83f51ffc2 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
touch: clarify some inline documentation
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Wed, 17 Jul 2019 17:58:40 +0200
parents dcdd2b3ce52c
children 355b8e17e14c
files hgext3rd/evolve/cmdrewrite.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/cmdrewrite.py	Thu Jul 04 17:32:58 2019 +0200
+++ b/hgext3rd/evolve/cmdrewrite.py	Wed Jul 17 17:58:40 2019 +0200
@@ -1376,8 +1376,8 @@
         p2 = newmapping.get(p2, p2)
 
         if not (duplicate or allowdivergence):
-            # The user hasn't yet decided what to do with the revived
-            # cset, let's ask
+            # If reviving this cset creates divergence, let's ask user
+            # what to do: create divergence or duplicate
             sset = obsutil.successorssets(repo, ctx.node())
             nodivergencerisk = (len(sset) == 0
                                 or (len(sset) == 1