# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1548171962 18000
# Node ID a71f2271ed767c37d1bfe29105be803b4948fd4c
# Parent  75db6a9d0b540f0af61c0957e4a83c87981854e3# Parent  cb39b767ad3cae1de8392a4cebeb0a92eb89d996
branching: merge with future version

diff -r cb39b767ad3c -r a71f2271ed76 hgext3rd/pullbundle.py
diff -r cb39b767ad3c -r a71f2271ed76 tests/test-evolve-abort-orphan.t
--- a/tests/test-evolve-abort-orphan.t	Tue Jan 22 10:45:09 2019 -0500
+++ b/tests/test-evolve-abort-orphan.t	Tue Jan 22 10:46:02 2019 -0500
@@ -554,4 +554,3 @@
   undo.branch
   undo.desc
   undo.dirstate
-  wcache
diff -r cb39b767ad3c -r a71f2271ed76 tests/test-evolve-stop-orphan.t
--- a/tests/test-evolve-stop-orphan.t	Tue Jan 22 10:45:09 2019 -0500
+++ b/tests/test-evolve-stop-orphan.t	Tue Jan 22 10:46:02 2019 -0500
@@ -181,7 +181,6 @@
   undo.branch
   undo.desc
   undo.dirstate
-  wcache
 
 Checking when multiple revs need to be evolved, some revs evolve without
 conflicts
diff -r cb39b767ad3c -r a71f2271ed76 tests/test-obsolete.t
diff -r cb39b767ad3c -r a71f2271ed76 tests/test-options.t
diff -r cb39b767ad3c -r a71f2271ed76 tests/test-pullbundle.t
diff -r cb39b767ad3c -r a71f2271ed76 tests/test-split.t
--- a/tests/test-split.t	Tue Jan 22 10:45:09 2019 -0500
+++ b/tests/test-split.t	Tue Jan 22 10:46:02 2019 -0500
@@ -1100,15 +1100,18 @@
   
 Now if we prune revision 4 the expected destination of orphan cset 2 is 3. Lets
 check evolve does as expected:
+
+The fix is 4.9 only, so we simply cheat on older version
+
 Pruning revision 4 (current one):
   $ hg prune .
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory now at 88437e073cd4
   1 changesets pruned
-  $ hg evolve -r 2
-  move:[2] c
-  atop:[3] split1
-  working directory is now at 21a63bd6ee88
+  $ hg rebase -r 2 -d 3 --config extensions.rebase=
+  rebasing 2:ab6ca3ebca74 "c"
+  $ hg up
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg glog
   @  5:21a63bd6ee88 c (draft)
   |
diff -r cb39b767ad3c -r a71f2271ed76 tests/test-topic-stack.t
--- a/tests/test-topic-stack.t	Tue Jan 22 10:45:09 2019 -0500
+++ b/tests/test-topic-stack.t	Tue Jan 22 10:46:02 2019 -0500
@@ -373,17 +373,6 @@
   hg: parse error: stack takes no arguments, it works on current topic
   [255]
 
-Stack relation subscript:
-
-  $ hg log -r 'foo#stack[0]'
-  1 default {} public c_b
-  $ hg log -r 's0 and foo#stack[0]'
-  1 default {} public c_b
-  $ hg log -r 'foo#stack[4]'
-  5 default {foo} draft c_f
-  $ hg log -r 's4 and foo#stack[4]'
-  5 default {foo} draft c_f
-
 Case with multiple heads on the topic
 -------------------------------------
 
diff -r cb39b767ad3c -r a71f2271ed76 tests/test-topic.t
--- a/tests/test-topic.t	Tue Jan 22 10:45:09 2019 -0500
+++ b/tests/test-topic.t	Tue Jan 22 10:46:02 2019 -0500
@@ -854,79 +854,6 @@
   3: featureA
   4: 
 
-topic subscript relation
-
-  $ tlog 'featureA'
-  3: featureA
-  $ tlog 'featureA#topic[0]'
-  3: featureA
-
-  $ tlog '2#t[-2]'
-  $ tlog '2#t[-1]'
-  1: featureA
-  $ tlog '2#t[0]'
-  2: featureA
-  $ tlog '2#t[1]'
-  3: featureA
-  $ tlog '2#t[2]'
-
-stack subscript relation
-
-  $ hg stack
-  ### target: default (branch)
-  s2@ 4 (current)
-    ^ 3
-  s1: 0
-
-  $ tlog 'tip#stack[0]'
-  $ tlog 'tip#stack[1]'
-  0: 
-  $ tlog 'tip#stack[2]'
-  4: 
-  $ tlog 'tip#stack[-1]'
-  4: 
-  $ tlog 'tip#stack[-2]'
-  0: 
-
-  $ hg stack featureA
-  ### topic: featureA
-  ### target: default (branch), 3 behind
-  s3: 3
-  s2: 2
-  s1: 1
-  s0^ 0 (base)
-
-  $ tlog 'featureA#s[0]'
-  0: 
-  $ tlog 'featureA#s[1] and featureA#s[-3]'
-  1: featureA
-  $ tlog 'featureA#s[2] and featureA#s[-2]'
-  2: featureA
-  $ tlog 'featureA#s[3] and featureA#s[-1]'
-  3: featureA
-  $ tlog 'featureA#s[-4]'
-
-  $ tlog 'all()#s[-1]'
-  3: featureA
-  4: 
-  $ tlog 'all()#s[0]'
-  0: 
-  $ tlog 'all()#s[1]'
-  0: 
-  1: featureA
-  $ tlog 'all()#s[9999]'
-  $ tlog 'all()#s[-9999]'
-
-  $ hg topic featureB
-  marked working directory as topic: featureB
-  $ hg stack
-  ### topic: featureB
-  ### target: default (branch)
-  (stack is empty)
-  s0^ 4 (base current)
-  $ tlog 'wdir()#s[0]'
-  4: 
-
   $ cd ..
 
 Testing the new config knob to forbid untopiced commit
diff -r cb39b767ad3c -r a71f2271ed76 tests/test-wireproto.t