# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1555527268 -7200
# Node ID f6099a171a9de9289f026df2e5467aefee08648a
# Parent  001eb0f11bcdd4d57e020e2e1d2cb110510baf59# Parent  36632d514af265c21c97de5d3ffe19bc5d8f4ea6
branching: merge 8.5.0 expected output in stable

Upstream stable is now for mercurial 5.0

diff -r 001eb0f11bcd -r f6099a171a9d hgext3rd/evolve/metadata.py
diff -r 001eb0f11bcd -r f6099a171a9d hgext3rd/topic/__init__.py
diff -r 001eb0f11bcd -r f6099a171a9d tests/test-split.t
--- a/tests/test-split.t	Wed Apr 17 18:46:41 2019 +0800
+++ b/tests/test-split.t	Wed Apr 17 20:54:28 2019 +0200
@@ -779,9 +779,18 @@
 
 (remaining changes gathered with unmatched one)
 
+adding content in files to make sure that it prompt us to select the changes,
+as it won't prompt if a file has no changes at hunk level and passed in cli
+(for more look into hg db72f9f6580e which made it to not prompt "examine changes to fileX"
+for files which are explicitly mentioned by user)
+  $ echo sp2 > SPLIT2
+  $ echo sp3 > SPLIT3
+  $ echo sp4 > SPLIT4
+  $ hg amend
+
   $ hg split SPLIT2 SPLIT3 << EOF
   > y
-  > n
+  > s
   > c
   > EOF
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
@@ -790,13 +799,18 @@
   adding SPLIT4
   diff --git a/SPLIT2 b/SPLIT2
   new file mode 100644
-  examine changes to 'SPLIT2'? [Ynesfdaq?] y
+  @@ -0,0 +1,1 @@
+  +sp2
+  record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
   
   diff --git a/SPLIT3 b/SPLIT3
   new file mode 100644
-  examine changes to 'SPLIT3'? [Ynesfdaq?] n
+  @@ -0,0 +1,1 @@
+  +sp3
+  record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s
   
   continue splitting? [Ycdq?] c
+
   $ hg status --change '.~1'
   A SPLIT2
   $ hg status --change '.'
@@ -810,7 +824,7 @@
 
   $ hg split SPLIT2 SPLIT3 << EOF
   > y
-  > n
+  > s
   > y
   > y
   > EOF
@@ -820,18 +834,25 @@
   adding SPLIT4
   diff --git a/SPLIT2 b/SPLIT2
   new file mode 100644
-  examine changes to 'SPLIT2'? [Ynesfdaq?] y
+  @@ -0,0 +1,1 @@
+  +sp2
+  record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
   
   diff --git a/SPLIT3 b/SPLIT3
   new file mode 100644
-  examine changes to 'SPLIT3'? [Ynesfdaq?] n
+  @@ -0,0 +1,1 @@
+  +sp3
+  record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s
   
   continue splitting? [Ycdq?] y
   diff --git a/SPLIT3 b/SPLIT3
   new file mode 100644
-  examine changes to 'SPLIT3'? [Ynesfdaq?] y
+  @@ -0,0 +1,1 @@
+  +sp3
+  record this change to 'SPLIT3'? [Ynesfdaq?] y
   
   no more change to split
+
   $ hg status --change '.~2'
   A SPLIT2
   $ hg status --change '.~1'
@@ -854,11 +875,15 @@
   adding SPLIT4
   diff --git a/SPLIT2 b/SPLIT2
   new file mode 100644
-  examine changes to 'SPLIT2'? [Ynesfdaq?] y
+  @@ -0,0 +1,1 @@
+  +sp2
+  record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
   
   diff --git a/SPLIT3 b/SPLIT3
   new file mode 100644
-  examine changes to 'SPLIT3'? [Ynesfdaq?] y
+  @@ -0,0 +1,1 @@
+  +sp3
+  record change 2/2 to 'SPLIT3'? [Ynesfdaq?] y
   
   no more change to split
   $ hg status --change '.~1'
@@ -874,7 +899,7 @@
 
   $ hg split SPLIT2 SPLIT3 << EOF
   > y
-  > n
+  > s
   > d
   > EOF
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
@@ -883,11 +908,15 @@
   adding SPLIT4
   diff --git a/SPLIT2 b/SPLIT2
   new file mode 100644
-  examine changes to 'SPLIT2'? [Ynesfdaq?] y
+  @@ -0,0 +1,1 @@
+  +sp2
+  record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
   
   diff --git a/SPLIT3 b/SPLIT3
   new file mode 100644
-  examine changes to 'SPLIT3'? [Ynesfdaq?] n
+  @@ -0,0 +1,1 @@
+  +sp3
+  record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s
   
   continue splitting? [Ycdq?] d
   discarding remaining changes
diff -r 001eb0f11bcd -r f6099a171a9d tests/test-topic.t
--- a/tests/test-topic.t	Wed Apr 17 18:46:41 2019 +0800
+++ b/tests/test-topic.t	Wed Apr 17 20:54:28 2019 +0200
@@ -860,6 +860,10 @@
   3: featureA
   $ tlog 'featureA#topic[0]'
   3: featureA
+  $ tlog 'featureA#topic[:]'
+  1: featureA
+  2: featureA
+  3: featureA
 
   $ tlog '2#t[-2]'
   $ tlog '2#t[-1]'
@@ -869,6 +873,10 @@
   $ tlog '2#t[1]'
   3: featureA
   $ tlog '2#t[2]'
+  $ tlog '2#t[-1:1]'
+  1: featureA
+  2: featureA
+  3: featureA
 
 stack subscript relation
 
@@ -898,6 +906,28 @@
 
   $ tlog 'featureA#s[0]'
   0: 
+  $ tlog 'featureA#s[0:0]'
+  0: 
+  $ tlog 'featureA#s[:]'
+  1: featureA
+  2: featureA
+  3: featureA
+  $ tlog 'featureA#s[2:]'
+  2: featureA
+  3: featureA
+  $ tlog 'featureA#s[:2]'
+  1: featureA
+  2: featureA
+  $ tlog 'featureA#s[0:1]'
+  0: 
+  1: featureA
+  $ tlog 'featureA#s[-1:0]'
+  0: 
+  3: featureA
+  $ tlog 'featureA#s[-3:3]'
+  1: featureA
+  2: featureA
+  3: featureA
   $ tlog 'featureA#s[1] and featureA#s[-3]'
   1: featureA
   $ tlog 'featureA#s[2] and featureA#s[-2]'
diff -r 001eb0f11bcd -r f6099a171a9d tests/test-uncommit-interactive.t
--- a/tests/test-uncommit-interactive.t	Wed Apr 17 18:46:41 2019 +0800
+++ b/tests/test-uncommit-interactive.t	Wed Apr 17 20:54:28 2019 +0200
@@ -780,12 +780,9 @@
 
   $ hg uncommit -i a << DONE
   > y
-  > y
   > DONE
   diff --git a/a b/a
   1 hunks, 1 lines changed
-  examine changes to 'a'? [Ynesfdaq?] y
-  
   @@ -9,3 +9,4 @@
    4
    5
@@ -846,13 +843,10 @@
 
   $ hg uncommit -i a << DONE
   > y
-  > y
   > n
   > DONE
   diff --git a/a b/a
   2 hunks, 2 lines changed
-  examine changes to 'a'? [Ynesfdaq?] y
-  
   @@ -1,3 +1,4 @@
   +-3
    -2