# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1603182826 -7200
# Node ID f27ef537bf83f2209c7cdc28174f282b10de87cb
# Parent  3946ee4ee3ae1d4b651fca1916a8b2fe5f275207# Parent  5e71952c8b4acd8d692b4d01720f6082f8ce408e
branching: merge with stable

diff -r 3946ee4ee3ae -r f27ef537bf83 hgext3rd/topic/revset.py
--- a/hgext3rd/topic/revset.py	Wed Oct 14 15:48:37 2020 +0200
+++ b/hgext3rd/topic/revset.py	Tue Oct 20 10:33:46 2020 +0200
@@ -76,7 +76,7 @@
 
 @revsetpredicate(b'ngtip([branch])')
 def ngtipset(repo, subset, x):
-    """The untopiced tip.
+    """The tip of a branch, ignoring changesets with a topic.
 
     Name is horrible so that people change it.
     """
@@ -85,7 +85,9 @@
     branch = revset.getstring(args[0], b'ngtip requires a string')
     if branch == b'.':
         branch = repo[b'.'].branch()
-    return subset & revset.baseset(destination.ngtip(repo, branch))
+    # list of length 1
+    revs = [repo[node].rev() for node in destination.ngtip(repo, branch)]
+    return subset & revset.baseset(revs)
 
 @revsetpredicate(b'stack()')
 def stackset(repo, subset, x):
diff -r 3946ee4ee3ae -r f27ef537bf83 tests/test-topic-dest.t
--- a/tests/test-topic-dest.t	Wed Oct 14 15:48:37 2020 +0200
+++ b/tests/test-topic-dest.t	Tue Oct 20 10:33:46 2020 +0200
@@ -42,8 +42,10 @@
   |
   o  0 () c_alpha
   
-  $ hg log -r 'ngtip(.)'
-  3 () c_delta
+  $ hg log -G -r 'ngtip(.)'
+  o  3 () c_delta
+  |
+  ~
   $ hg log -r 'default'
   3 () c_delta