tests/test-topic-change.t
author Pulkit Goyal <7895pulkit@gmail.com>
Tue, 22 May 2018 20:33:42 +0530
changeset 3759 3fe3f3070df9
parent 3580 031d70bcbb42
child 3590 d5adce52cef4
child 3769 1bc4b0807c37
permissions -rw-r--r--
content-divergence: store the resolved revs in evolvestate['replacements'] The support for continuing a conflicted content-divergence resolution was added some time ago. That support lacked storing of the resolved rev in the evolvestate['replacements'] which marks the node as resolved and does not try to resolve that node again. Since we didn't store, the resolution, processes the same node again. This patch makes sure we store the information in evolvestate that a certain content-divergent node is resolved to prevent pre-processing it again.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3037
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     1
Tests for changing and clearing topics
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     2
======================================
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     3
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     4
  $ . "$TESTDIR/testlib/topic_setup.sh"
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     5
  $ cat <<EOF >> $HGRCPATH
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     6
  > [experimental]
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     7
  > # disable the new graph style until we drop 3.7 support
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     8
  > graphstyle.missing = |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     9
  > evolution=createmarkers, allowunstable
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    10
  > [phases]
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    11
  > publish=false
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    12
  > [alias]
3384
2b06f144b6e0 topics: add a new templatekeyword `topic`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
    13
  > glog = log -G -T "{rev}:{node|short} \{{topic}}\n{desc}  ({bookmarks})\n\n"
3037
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    14
  > EOF
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    15
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    16
About the glog output: {} contains the topic name and () will contain the bookmark
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    17
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    18
Setting up a repo
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    19
----------------
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    20
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    21
  $ hg init topics
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    22
  $ cd topics
3041
e162597b375a test: remove bashism in test-topic-change.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3040
diff changeset
    23
  $ for ch in a b c d e f g h; do touch $ch; echo "foo" >> $ch; hg ci -Aqm "Added "$ch; done
3037
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    24
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    25
  $ hg glog
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    26
  @  7:ec2426147f0e {}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    27
  |  Added h  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    28
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    29
  o  6:87d6d6676308 {}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    30
  |  Added g  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    31
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    32
  o  5:825660c69f0c {}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    33
  |  Added f  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    34
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    35
  o  4:aa98ab95a928 {}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    36
  |  Added e  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    37
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    38
  o  3:62615734edd5 {}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    39
  |  Added d  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    40
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    41
  o  2:28ad74487de9 {}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    42
  |  Added c  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    43
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    44
  o  1:29becc82797a {}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    45
  |  Added b  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    46
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    47
  o  0:18d04c59bb5d {}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    48
     Added a  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    49
  
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    50
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    51
Clearing topic from revision without topic
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    52
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    53
  $ hg topic -r . --clear
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    54
  changed topic on 0 changes
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    55
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    56
Clearing current topic when no active topic is not error
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    57
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    58
  $ hg topic
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    59
  $ hg topic --clear
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    60
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    61
Setting topics to all the revisions
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    62
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    63
  $ hg topic -r 0:: foo
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    64
  switching to topic foo
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    65
  changed topic on 8 changes
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    66
  $ hg glog
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    67
  @  15:05095f607171 {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    68
  |  Added h  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    69
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    70
  o  14:97505b53ab0d {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    71
  |  Added g  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    72
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    73
  o  13:75a8360fe626 {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    74
  |  Added f  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    75
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    76
  o  12:abcedffeae90 {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    77
  |  Added e  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    78
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    79
  o  11:1315a3808ed0 {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    80
  |  Added d  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    81
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    82
  o  10:1fa891977a22 {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    83
  |  Added c  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    84
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    85
  o  9:a53ba98dd6b8 {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    86
  |  Added b  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    87
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    88
  o  8:86a186070af2 {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    89
     Added a  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    90
  
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    91
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    92
Clearing the active topic using --clear
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    93
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    94
  $ hg topic
3060
f43a310c4338 topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3041
diff changeset
    95
   * foo (8 changesets)
3037
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    96
  $ hg topic --clear
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    97
  $ hg topic
3060
f43a310c4338 topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3041
diff changeset
    98
     foo (8 changesets)
3037
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    99
Changing topics on some revisions (also testing issue 5441)
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   100
3580
031d70bcbb42 test: do not use revision number
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3431
diff changeset
   101
  $ hg topic -r abcedffeae90:: bar
3037
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   102
  switching to topic bar
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   103
  changed topic on 4 changes
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   104
  $ hg glog
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   105
  @  19:d7d36e193ea7 {bar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   106
  |  Added h  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   107
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   108
  o  18:e7b418d79a05 {bar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   109
  |  Added g  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   110
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   111
  o  17:82e0b14f4d9e {bar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   112
  |  Added f  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   113
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   114
  o  16:edc4a6b9ea60 {bar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   115
  |  Added e  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   116
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   117
  o  11:1315a3808ed0 {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   118
  |  Added d  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   119
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   120
  o  10:1fa891977a22 {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   121
  |  Added c  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   122
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   123
  o  9:a53ba98dd6b8 {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   124
  |  Added b  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   125
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   126
  o  8:86a186070af2 {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   127
     Added a  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   128
  
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   129
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   130
Changing topics without passing topic name and clear
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   131
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   132
  $ hg topic -r .
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   133
  abort: changing topic requires a topic name or --clear
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   134
  [255]
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   135
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   136
Changing topic using --current flag
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   137
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   138
  $ hg topic foobar
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   139
  $ hg topic -r . --current
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   140
  active topic 'foobar' grew its first changeset
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   141
  changed topic on 1 changes
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   142
  $ hg glog -r .
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   143
  @  20:c2d6b7df5dcf {foobar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   144
  |  Added h  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   145
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   146
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   147
Changing topic in between the stack
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   148
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   149
  $ hg topic -r 9::10 --current
3431
2e703ed1c713 evolve: update output for wider reporting of troubled changesets
Martin von Zweigbergk <martinvonz@google.com>
parents: 3417
diff changeset
   150
  5 new orphan changesets
3037
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   151
  changed topic on 2 changes
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   152
  $ hg glog
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   153
  o  22:1b88140feefe {foobar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   154
  |  Added c  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   155
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   156
  o  21:c39cabfcbbf7 {foobar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   157
  |  Added b  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   158
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   159
  | @  20:c2d6b7df5dcf {foobar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   160
  | |  Added h  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   161
  | |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3411
diff changeset
   162
  | *  18:e7b418d79a05 {bar}
3037
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   163
  | |  Added g  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   164
  | |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3411
diff changeset
   165
  | *  17:82e0b14f4d9e {bar}
3037
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   166
  | |  Added f  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   167
  | |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3411
diff changeset
   168
  | *  16:edc4a6b9ea60 {bar}
3037
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   169
  | |  Added e  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   170
  | |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3411
diff changeset
   171
  | *  11:1315a3808ed0 {foo}
3037
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   172
  | |  Added d  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   173
  | |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   174
  | x  10:1fa891977a22 {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   175
  | |  Added c  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   176
  | |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   177
  | x  9:a53ba98dd6b8 {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   178
  |/   Added b  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   179
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   180
  o  8:86a186070af2 {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   181
     Added a  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   182
  
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   183
  $ hg rebase -s 11 -d 22
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   184
  rebasing 11:1315a3808ed0 "Added d" (foo)
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   185
  switching to topic foo
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   186
  rebasing 16:edc4a6b9ea60 "Added e" (bar)
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   187
  switching to topic bar
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   188
  rebasing 17:82e0b14f4d9e "Added f" (bar)
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   189
  rebasing 18:e7b418d79a05 "Added g" (bar)
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   190
  rebasing 20:c2d6b7df5dcf "Added h" (foobar)
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   191
  switching to topic foobar
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   192
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   193
  $ hg glog
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   194
  @  27:a1a9465da59b {foobar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   195
  |  Added h  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   196
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   197
  o  26:7c76c271395f {bar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   198
  |  Added g  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   199
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   200
  o  25:7f26084dfaf1 {bar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   201
  |  Added f  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   202
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   203
  o  24:b1f05e9ba0b5 {bar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   204
  |  Added e  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   205
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   206
  o  23:f9869da2286e {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   207
  |  Added d  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   208
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   209
  o  22:1b88140feefe {foobar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   210
  |  Added c  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   211
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   212
  o  21:c39cabfcbbf7 {foobar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   213
  |  Added b  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   214
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   215
  o  8:86a186070af2 {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   216
     Added a  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   217
  
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   218
Amending a topic
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   219
----------------
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   220
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   221
When the changeset has a topic and we have different active topic
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   222
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   223
  $ hg topic wat
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   224
  $ hg ci --amend
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   225
  active topic 'wat' grew its first changeset
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   226
  $ hg glog -r .
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   227
  @  28:61470c956807 {wat}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   228
  |  Added h  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   229
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   230
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   231
Clear the current topic and amending
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   232
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   233
  $ hg topic --clear
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   234
  $ hg ci --amend
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   235
  $ hg glog -r .
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   236
  @  29:b584fa49f42e {}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   237
  |  Added h  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   238
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   239
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   240
When the changeset does not has a topic but we have an active topic
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   241
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   242
  $ hg topic watwat
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   243
  marked working directory as topic: watwat
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   244
  $ hg ci --amend
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   245
  active topic 'watwat' grew its first changeset
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   246
  $ hg glog -r .
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   247
  @  30:a24c31c35013 {watwat}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   248
  |  Added h  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   249
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   250
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   251
Testing changing topics on public changeset
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   252
-------------------------------------------
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   253
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   254
  $ hg phase -r 8 -p
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   255
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   256
Clearing the topic
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   257
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   258
  $ hg topic -r 8 --clear
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   259
  abort: can't change topic of a public change
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   260
  [255]
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   261
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   262
Changing the topic
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   263
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   264
  $ hg topic -r 8 foobarboo
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   265
  abort: can't change topic of a public change
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   266
  [255]
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   267
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   268
Testing the bookmark movement
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   269
-----------------------------
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   270
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   271
  $ hg bookmark book
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   272
  $ hg glog
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   273
  @  30:a24c31c35013 {watwat}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   274
  |  Added h  (book)
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   275
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   276
  o  26:7c76c271395f {bar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   277
  |  Added g  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   278
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   279
  o  25:7f26084dfaf1 {bar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   280
  |  Added f  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   281
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   282
  o  24:b1f05e9ba0b5 {bar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   283
  |  Added e  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   284
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   285
  o  23:f9869da2286e {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   286
  |  Added d  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   287
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   288
  o  22:1b88140feefe {foobar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   289
  |  Added c  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   290
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   291
  o  21:c39cabfcbbf7 {foobar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   292
  |  Added b  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   293
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   294
  o  8:86a186070af2 {}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   295
     Added a  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   296
  
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   297
On clearing the topic
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   298
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   299
  $ hg topic -r . --clear
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   300
  clearing empty topic "watwat"
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   301
  active topic 'watwat' is now empty
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   302
  changed topic on 1 changes
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   303
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   304
  $ hg glog
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   305
  @  31:c48d6d71b2d9 {}
3038
103244e34a9c topics: use scmutil.cleanupnodes to create markers while changing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3037
diff changeset
   306
  |  Added h  (book)
3037
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   307
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   308
  o  26:7c76c271395f {bar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   309
  |  Added g  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   310
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   311
  o  25:7f26084dfaf1 {bar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   312
  |  Added f  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   313
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   314
  o  24:b1f05e9ba0b5 {bar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   315
  |  Added e  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   316
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   317
  o  23:f9869da2286e {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   318
  |  Added d  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   319
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   320
  o  22:1b88140feefe {foobar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   321
  |  Added c  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   322
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   323
  o  21:c39cabfcbbf7 {foobar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   324
  |  Added b  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   325
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   326
  o  8:86a186070af2 {}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   327
     Added a  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   328
  
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   329
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   330
On changing the topic
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   331
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   332
  $ hg bookmark bookboo
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   333
  $ hg topic -r . movebook
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   334
  switching to topic movebook
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   335
  changed topic on 1 changes
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   336
  $ hg glog
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   337
  @  32:1b83d11095b9 {movebook}
3038
103244e34a9c topics: use scmutil.cleanupnodes to create markers while changing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3037
diff changeset
   338
  |  Added h  (book bookboo)
3037
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   339
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   340
  o  26:7c76c271395f {bar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   341
  |  Added g  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   342
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   343
  o  25:7f26084dfaf1 {bar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   344
  |  Added f  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   345
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   346
  o  24:b1f05e9ba0b5 {bar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   347
  |  Added e  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   348
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   349
  o  23:f9869da2286e {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   350
  |  Added d  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   351
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   352
  o  22:1b88140feefe {foobar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   353
  |  Added c  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   354
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   355
  o  21:c39cabfcbbf7 {foobar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   356
  |  Added b  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   357
  |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   358
  o  8:86a186070af2 {}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   359
     Added a  ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   360
  
3039
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   361
Changing topic on secret changesets
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   362
-----------------------------------
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   363
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   364
  $ hg up 26
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   365
  switching to topic bar
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   366
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   367
  (leaving bookmark bookboo)
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   368
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   369
  $ hg phase -r . -s -f
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   370
  $ hg phase -r .
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   371
  26: secret
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   372
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   373
  $ hg topic -r . watwat
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   374
  switching to topic watwat
3431
2e703ed1c713 evolve: update output for wider reporting of troubled changesets
Martin von Zweigbergk <martinvonz@google.com>
parents: 3417
diff changeset
   375
  1 new orphan changesets
3039
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   376
  changed topic on 1 changes
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   377
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   378
  $ hg glog
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   379
  @  33:894983f69e69 {watwat}
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   380
  |  Added g  ()
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   381
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3411
diff changeset
   382
  | *  32:1b83d11095b9 {movebook}
3039
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   383
  | |  Added h  (book bookboo)
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   384
  | |
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   385
  | x  26:7c76c271395f {bar}
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   386
  |/   Added g  ()
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   387
  |
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   388
  o  25:7f26084dfaf1 {bar}
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   389
  |  Added f  ()
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   390
  |
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   391
  o  24:b1f05e9ba0b5 {bar}
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   392
  |  Added e  ()
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   393
  |
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   394
  o  23:f9869da2286e {foo}
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   395
  |  Added d  ()
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   396
  |
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   397
  o  22:1b88140feefe {foobar}
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   398
  |  Added c  ()
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   399
  |
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   400
  o  21:c39cabfcbbf7 {foobar}
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   401
  |  Added b  ()
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   402
  |
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   403
  o  8:86a186070af2 {}
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   404
     Added a  ()
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   405
  
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3038
diff changeset
   406
  $ hg phase -r .
3040
a05b6580f71c topics: handle phase correctly while changing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3039
diff changeset
   407
  33: secret