tests/test-evolve-topic.t
branchmercurial-4.1
changeset 3593 b92114f201c9
parent 3591 98941c28f3e2
--- a/tests/test-evolve-topic.t	Wed Mar 21 16:32:54 2018 +0100
+++ b/tests/test-evolve-topic.t	Wed Mar 21 16:35:18 2018 +0100
@@ -267,113 +267,3 @@
   $ hg prev
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   [20] add fff
-
-Testing issue 5708 when we are on obsolete changeset and there is active topic
-------------------------------------------------------------------------------
-
-  $ hg log --graph
-  @  20 - {bar} 793eb6370b2d add fff (draft)
-  |
-  | o  19 - {bar} 9bf430c106b7 add jjj (draft)
-  | |
-  | o  18 - {bar} d2dc89c57700 add iii (draft)
-  | |
-  | o  17 - {bar} 20bc4d02aa62 add hhh (draft)
-  | |
-  | o  16 - {bar} 16d6f664b17c add ggg (draft)
-  | |
-  | x  15 - {foo} 070c5573d8f9 add fff (draft)
-  |/
-  o  14 - {foo} 42b49017ff90 add eee (draft)
-  |
-  o  11 - {foo} d9cacd156ffc add ddd (draft)
-  |
-  o  2 - {foo} cced9bac76e3 add ccc (draft)
-  |
-  o  1 - {} a4dbed0837ea add bbb (draft)
-  |
-  o  0 - {} 199cc73e9a0b add aaa (draft)
-  
-
-  $ hg topic
-   * bar (5 changesets, 4 troubled)
-     foo (3 changesets)
-
-When the current topic, obsoleted changesets topic and successor topic are same
-
-  $ hg up 20bc4d02aa62
-  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ echo foobar >> hhh
-  $ hg amend
-  $ hg up 20bc4d02aa62
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory parent is obsolete! (20bc4d02aa62)
-  (use 'hg evolve' to update to its successor: d834582d9ee3)
-  $ hg log -Gr 14::
-  o  22 - {bar} d834582d9ee3 add hhh (draft)
-  |
-  | o  20 - {bar} 793eb6370b2d add fff (draft)
-  | |
-  | | o  19 - {bar} 9bf430c106b7 add jjj (draft)
-  | | |
-  | | o  18 - {bar} d2dc89c57700 add iii (draft)
-  | | |
-  +---@  17 - {bar} 20bc4d02aa62 add hhh (draft)
-  | |
-  o |  16 - {bar} 16d6f664b17c add ggg (draft)
-  | |
-  x |  15 - {foo} 070c5573d8f9 add fff (draft)
-  |/
-  o  14 - {foo} 42b49017ff90 add eee (draft)
-  |
-  ~
-
-  $ hg prev
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  [16] add ggg
-
-When the current topic and successors topic are same, but obsolete cset has
-different topic
-
-  $ hg rebase -s d2dc89c57700 -d d834582d9ee3 --config extensions.rebase=
-  rebasing 18:d2dc89c57700 "add iii"
-  rebasing 19:9bf430c106b7 "add jjj"
-  $ hg log -Gr 42b49017ff90::
-  o  24 - {bar} 7542e76aba2c add jjj (draft)
-  |
-  o  23 - {bar} 7858bd7e9906 add iii (draft)
-  |
-  o  22 - {bar} d834582d9ee3 add hhh (draft)
-  |
-  | o  20 - {bar} 793eb6370b2d add fff (draft)
-  | |
-  @ |  16 - {bar} 16d6f664b17c add ggg (draft)
-  | |
-  x |  15 - {foo} 070c5573d8f9 add fff (draft)
-  |/
-  o  14 - {foo} 42b49017ff90 add eee (draft)
-  |
-  ~
-
-  $ hg up 070c5573d8f9
-  switching to topic foo
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  working directory parent is obsolete! (070c5573d8f9)
-  (use 'hg evolve' to update to its successor: 793eb6370b2d)
-
-  $ hg topic bar
-
-  $ hg prev
-  no parent in topic "bar"
-  (do you want --no-topic)
-  [1]
-
-When current topic and obsolete cset topic are same but successor has different
-one
-
-  $ hg up 070c5573d8f9
-  switching to topic foo
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg prev
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  [14] add eee