Mercurial > evolve

changeset 5569:43166f87407b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: update docstring for mergeusers()
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Tue, 22 Sep 2020 13:43:41 +0530
parents 7f8055eb07c7
children 15cc99069c57
files hgext3rd/evolve/utility.py
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/utility.py	Fri Oct 02 10:09:14 2020 -0700
+++ b/hgext3rd/evolve/utility.py	Tue Sep 22 13:43:41 2020 +0530
@@ -209,8 +209,11 @@
     return revs[intidx - 1]
 
 def mergeusers(ui, base, divergent, other):
-    """ merges the users from two divergent changesets using three-way merge
-    and return the user that will be used as the author of resolved cset"""
+    """Return the merged user from two divergent changesets.
+
+    Perform merge using 3-way merge. If unable to merge, concatenate
+    the two users.
+    """
     baseuser = base.user()
     divuser = divergent.user()
     othuser = other.user()