tests/test-stack-branch.t
author Pierre-Yves David <pierre-yves.david@octobus.net>
Tue, 10 Oct 2017 16:22:21 +0200
branchstable
changeset 3050 6603d5655192
parent 3000 bd7e8be29542
child 3013 945a0989e41b
permissions -rw-r--r--
obsfate: add a test with user both current and other This will help highlight change in the next changesets.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2669
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
     1
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
     2
  $ . "$TESTDIR/testlib/topic_setup.sh"
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
     3
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
     4
Initial setup
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
     5
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
     6
  $ cat << EOF >> $HGRCPATH
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
     7
  > [ui]
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
     8
  > logtemplate = {rev} {branch} \{{get(namespaces, "topics")}} {phase} {desc|firstline}\n
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
     9
  > [experimental]
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    10
  > evolution=createmarkers,exchange,allowunstable
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    11
  > EOF
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    12
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    13
  $ hg init main
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    14
  $ cd main
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    15
  $ hg branch other
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    16
  marked working directory as branch other
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    17
  (branches are permanent and global, did you want a bookmark?)
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    18
  $ echo aaa > aaa
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    19
  $ hg add aaa
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    20
  $ hg commit -m c_a
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    21
  $ echo aaa > bbb
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    22
  $ hg add bbb
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    23
  $ hg commit -m c_b
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    24
  $ hg branch foo
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    25
  marked working directory as branch foo
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    26
  $ echo aaa > ccc
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    27
  $ hg add ccc
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    28
  $ hg commit -m c_c
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    29
  $ echo aaa > ddd
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    30
  $ hg add ddd
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    31
  $ hg commit -m c_d
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    32
  $ echo aaa > eee
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    33
  $ hg add eee
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    34
  $ hg commit -m c_e
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    35
  $ echo aaa > fff
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    36
  $ hg add fff
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    37
  $ hg commit -m c_f
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    38
  $ hg log -G
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    39
  @  5 foo {} draft c_f
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    40
  |
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    41
  o  4 foo {} draft c_e
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    42
  |
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    43
  o  3 foo {} draft c_d
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    44
  |
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    45
  o  2 foo {} draft c_c
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    46
  |
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    47
  o  1 other {} draft c_b
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    48
  |
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    49
  o  0 other {} draft c_a
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    50
  
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    51
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    52
Check that topic without any parent does not crash --list
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    53
---------------------------------------------------------
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    54
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    55
  $ hg up other
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    56
  0 files updated, 0 files merged, 4 files removed, 0 files unresolved
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    57
  $ hg stack
2997
a61634f52742 topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2929
diff changeset
    58
  ### target: other (branch)
2669
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    59
  b2@ c_b (current)
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    60
  b1: c_a
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    61
  $ hg phase --public 'branch("other")'
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    62
  $ hg up foo
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    63
  4 files updated, 0 files merged, 0 files removed, 0 files unresolved
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    64
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    65
Simple test
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    66
-----------
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    67
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    68
'hg stack' list all changeset in the topic
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    69
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    70
  $ hg branch
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    71
  foo
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    72
  $ hg stack
2997
a61634f52742 topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2929
diff changeset
    73
  ### target: foo (branch)
2669
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    74
  b4@ c_f (current)
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    75
  b3: c_e
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    76
  b2: c_d
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    77
  b1: c_c
2712
f19b314d8475 topics: add t0 and b0 to the stack
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2691
diff changeset
    78
  b0^ c_b (base)
2750
bd3824d1b795 stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2712
diff changeset
    79
  $ hg stack -v
2997
a61634f52742 topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2929
diff changeset
    80
  ### target: foo (branch)
2750
bd3824d1b795 stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2712
diff changeset
    81
  b4(913c298d8b0a)@ c_f (current)
bd3824d1b795 stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2712
diff changeset
    82
  b3(4f2a69f6d380): c_e
bd3824d1b795 stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2712
diff changeset
    83
  b2(f61adbacd17a): c_d
bd3824d1b795 stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2712
diff changeset
    84
  b1(3e9313bc4b71): c_c
bd3824d1b795 stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2712
diff changeset
    85
  b0(4a04f1104a27)^ c_b (base)
2669
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    86
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    87
Test "t#" reference
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    88
-------------------
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    89
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    90
  $ hg up b2
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    91
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    92
  $ hg up foo
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    93
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    94
  $ hg up b42
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    95
  abort: cannot resolve "b42": branch "foo" has only 4 changesets
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    96
  [255]
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    97
  $ hg up b2
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    98
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    99
  $ hg summary
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   100
  parent: 3:f61adbacd17a 
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   101
   c_d
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   102
  branch: foo
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   103
  commit: (clean)
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   104
  update: 2 new changesets (update)
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   105
  phases: 4 draft
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   106
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   107
Case with some of the branch unstable
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   108
------------------------------------
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   109
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   110
  $ echo bbb > ddd
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   111
  $ hg commit --amend
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   112
  $ hg log -G
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   113
  @  7 foo {} draft c_d
2669
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   114
  |
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   115
  | o  5 foo {} draft c_f
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   116
  | |
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   117
  | o  4 foo {} draft c_e
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   118
  | |
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   119
  | x  3 foo {} draft c_d
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   120
  |/
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   121
  o  2 foo {} draft c_c
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   122
  |
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   123
  o  1 other {} public c_b
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   124
  |
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   125
  o  0 other {} public c_a
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   126
  
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   127
  $ hg stack
2997
a61634f52742 topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2929
diff changeset
   128
  ### target: foo (branch)
2669
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   129
  b4$ c_f (unstable)
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   130
  b3$ c_e (unstable)
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   131
  b2@ c_d (current)
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   132
  b1: c_c
2712
f19b314d8475 topics: add t0 and b0 to the stack
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2691
diff changeset
   133
  b0^ c_b (base)
2669
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   134
  $ hg up b3
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   135
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   136
  $ hg stack
2997
a61634f52742 topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2929
diff changeset
   137
  ### target: foo (branch)
2669
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   138
  b4$ c_f (unstable)
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   139
  b3$ c_e (current unstable)
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   140
  b2: c_d
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   141
  b1: c_c
2712
f19b314d8475 topics: add t0 and b0 to the stack
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2691
diff changeset
   142
  b0^ c_b (base)
2669
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   143
  $ hg up b2
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   144
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   145
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   146
Also test the revset:
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   147
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   148
  $ hg log -r 'stack()'
2682
a6e3c2fcb1d7 topic: don't abort if there is no current topic in stack() revset
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2670
diff changeset
   149
  2 foo {} draft c_c
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   150
  7 foo {} draft c_d
2682
a6e3c2fcb1d7 topic: don't abort if there is no current topic in stack() revset
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2670
diff changeset
   151
  4 foo {} draft c_e
a6e3c2fcb1d7 topic: don't abort if there is no current topic in stack() revset
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2670
diff changeset
   152
  5 foo {} draft c_f
2669
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   153
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   154
Case with multiple heads on the topic
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   155
-------------------------------------
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   156
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   157
Make things linear again
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   158
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   159
  $ hg rebase -s 'desc(c_e)' -d 'desc(c_d) - obsolete()'
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   160
  rebasing 4:4f2a69f6d380 "c_e"
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   161
  rebasing 5:913c298d8b0a "c_f"
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   162
  $ hg log -G
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   163
  o  9 foo {} draft c_f
2669
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   164
  |
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   165
  o  8 foo {} draft c_e
2669
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   166
  |
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   167
  @  7 foo {} draft c_d
2669
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   168
  |
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   169
  o  2 foo {} draft c_c
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   170
  |
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   171
  o  1 other {} public c_b
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   172
  |
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   173
  o  0 other {} public c_a
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   174
  
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   175
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   176
Create the second branch
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   177
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   178
  $ hg up 'desc(c_d)'
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   179
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   180
  $ echo aaa > ggg
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   181
  $ hg add ggg
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   182
  $ hg commit -m c_g
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   183
  created new head
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   184
  $ echo aaa > hhh
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   185
  $ hg add hhh
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   186
  $ hg commit -m c_h
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   187
  $ hg log -G
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   188
  @  11 foo {} draft c_h
2669
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   189
  |
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   190
  o  10 foo {} draft c_g
2669
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   191
  |
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   192
  | o  9 foo {} draft c_f
2669
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   193
  | |
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   194
  | o  8 foo {} draft c_e
2669
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   195
  |/
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   196
  o  7 foo {} draft c_d
2669
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   197
  |
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   198
  o  2 foo {} draft c_c
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   199
  |
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   200
  o  1 other {} public c_b
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   201
  |
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   202
  o  0 other {} public c_a
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   203
  
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   204
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   205
Test output
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   206
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   207
  $ hg stack
2997
a61634f52742 topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2929
diff changeset
   208
  ### target: foo (branch) (2 heads)
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   209
  b6: c_f
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   210
  b5: c_e
2669
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   211
  b2^ c_d (base)
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   212
  b4@ c_h (current)
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   213
  b3: c_g
2669
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   214
  b2: c_d
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   215
  b1: c_c
2712
f19b314d8475 topics: add t0 and b0 to the stack
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2691
diff changeset
   216
  b0^ c_b (base)
2669
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   217
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   218
Case with multiple heads on the topic with unstability involved
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   219
---------------------------------------------------------------
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   220
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   221
We amend the message to make sure the display base pick the right changeset
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   222
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   223
  $ hg up 'desc(c_d)'
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   224
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   225
  $ echo ccc > ddd
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   226
  $ hg commit --amend -m 'c_D' 
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   227
  $ hg rebase -d . -s 'desc(c_g)'
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   228
  rebasing 10:2ebb6e48ab8a "c_g"
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   229
  rebasing 11:634f38e27a1d "c_h"
2669
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   230
  $ hg log -G
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   231
  o  15 foo {} draft c_h
2669
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   232
  |
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   233
  o  14 foo {} draft c_g
2669
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   234
  |
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   235
  @  13 foo {} draft c_D
2669
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   236
  |
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   237
  | o  9 foo {} draft c_f
2669
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   238
  | |
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   239
  | o  8 foo {} draft c_e
2669
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   240
  | |
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   241
  | x  7 foo {} draft c_d
2669
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   242
  |/
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   243
  o  2 foo {} draft c_c
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   244
  |
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   245
  o  1 other {} public c_b
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   246
  |
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   247
  o  0 other {} public c_a
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   248
  
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   249
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   250
  $ hg stack
2997
a61634f52742 topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2929
diff changeset
   251
  ### target: foo (branch) (2 heads)
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   252
  b6$ c_f (unstable)
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   253
  b5$ c_e (unstable)
2669
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   254
  b2^ c_D (base)
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   255
  b4: c_h
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   256
  b3: c_g
2669
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   257
  b2@ c_D (current)
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   258
  b1: c_c
2712
f19b314d8475 topics: add t0 and b0 to the stack
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2691
diff changeset
   259
  b0^ c_b (base)
2669
b933a8068c17 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
   260
2684
90e11985d0cc topic: exclude public and topic changeset from branch stack
Boris Feld <boris.feld@octobus.net>
parents: 2682
diff changeset
   261
Check that stack doesn't show draft changesets on a branch
90e11985d0cc topic: exclude public and topic changeset from branch stack
Boris Feld <boris.feld@octobus.net>
parents: 2682
diff changeset
   262
----------------------------------------------------------
90e11985d0cc topic: exclude public and topic changeset from branch stack
Boris Feld <boris.feld@octobus.net>
parents: 2682
diff changeset
   263
2920
ef4832faaf09 test: issue a clarifying graph print in tests/test-stack-branch.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2750
diff changeset
   264
  $ hg log --graph
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   265
  o  15 foo {} draft c_h
2920
ef4832faaf09 test: issue a clarifying graph print in tests/test-stack-branch.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2750
diff changeset
   266
  |
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   267
  o  14 foo {} draft c_g
2920
ef4832faaf09 test: issue a clarifying graph print in tests/test-stack-branch.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2750
diff changeset
   268
  |
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   269
  @  13 foo {} draft c_D
2920
ef4832faaf09 test: issue a clarifying graph print in tests/test-stack-branch.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2750
diff changeset
   270
  |
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   271
  | o  9 foo {} draft c_f
2920
ef4832faaf09 test: issue a clarifying graph print in tests/test-stack-branch.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2750
diff changeset
   272
  | |
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   273
  | o  8 foo {} draft c_e
2920
ef4832faaf09 test: issue a clarifying graph print in tests/test-stack-branch.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2750
diff changeset
   274
  | |
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   275
  | x  7 foo {} draft c_d
2920
ef4832faaf09 test: issue a clarifying graph print in tests/test-stack-branch.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2750
diff changeset
   276
  |/
ef4832faaf09 test: issue a clarifying graph print in tests/test-stack-branch.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2750
diff changeset
   277
  o  2 foo {} draft c_c
ef4832faaf09 test: issue a clarifying graph print in tests/test-stack-branch.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2750
diff changeset
   278
  |
ef4832faaf09 test: issue a clarifying graph print in tests/test-stack-branch.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2750
diff changeset
   279
  o  1 other {} public c_b
ef4832faaf09 test: issue a clarifying graph print in tests/test-stack-branch.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2750
diff changeset
   280
  |
ef4832faaf09 test: issue a clarifying graph print in tests/test-stack-branch.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2750
diff changeset
   281
  o  0 other {} public c_a
ef4832faaf09 test: issue a clarifying graph print in tests/test-stack-branch.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2750
diff changeset
   282
  
ef4832faaf09 test: issue a clarifying graph print in tests/test-stack-branch.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2750
diff changeset
   283
2684
90e11985d0cc topic: exclude public and topic changeset from branch stack
Boris Feld <boris.feld@octobus.net>
parents: 2682
diff changeset
   284
  $ hg stack
2997
a61634f52742 topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2929
diff changeset
   285
  ### target: foo (branch) (2 heads)
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   286
  b6$ c_f (unstable)
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   287
  b5$ c_e (unstable)
2684
90e11985d0cc topic: exclude public and topic changeset from branch stack
Boris Feld <boris.feld@octobus.net>
parents: 2682
diff changeset
   288
  b2^ c_D (base)
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   289
  b4: c_h
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   290
  b3: c_g
2684
90e11985d0cc topic: exclude public and topic changeset from branch stack
Boris Feld <boris.feld@octobus.net>
parents: 2682
diff changeset
   291
  b2@ c_D (current)
90e11985d0cc topic: exclude public and topic changeset from branch stack
Boris Feld <boris.feld@octobus.net>
parents: 2682
diff changeset
   292
  b1: c_c
2712
f19b314d8475 topics: add t0 and b0 to the stack
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2691
diff changeset
   293
  b0^ c_b (base)
2684
90e11985d0cc topic: exclude public and topic changeset from branch stack
Boris Feld <boris.feld@octobus.net>
parents: 2682
diff changeset
   294
  $ hg phase --public b1
90e11985d0cc topic: exclude public and topic changeset from branch stack
Boris Feld <boris.feld@octobus.net>
parents: 2682
diff changeset
   295
  $ hg stack
2997
a61634f52742 topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2929
diff changeset
   296
  ### target: foo (branch) (2 heads)
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   297
  b5$ c_f (unstable)
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   298
  b4$ c_e (unstable)
2684
90e11985d0cc topic: exclude public and topic changeset from branch stack
Boris Feld <boris.feld@octobus.net>
parents: 2682
diff changeset
   299
  b1^ c_D (base)
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   300
  b3: c_h
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   301
  b2: c_g
2684
90e11985d0cc topic: exclude public and topic changeset from branch stack
Boris Feld <boris.feld@octobus.net>
parents: 2682
diff changeset
   302
  b1@ c_D (current)
2712
f19b314d8475 topics: add t0 and b0 to the stack
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2691
diff changeset
   303
  b0^ c_c (base)
2684
90e11985d0cc topic: exclude public and topic changeset from branch stack
Boris Feld <boris.feld@octobus.net>
parents: 2682
diff changeset
   304
90e11985d0cc topic: exclude public and topic changeset from branch stack
Boris Feld <boris.feld@octobus.net>
parents: 2682
diff changeset
   305
Check that stack doesn't show changeset with a topic
90e11985d0cc topic: exclude public and topic changeset from branch stack
Boris Feld <boris.feld@octobus.net>
parents: 2682
diff changeset
   306
----------------------------------------------------
90e11985d0cc topic: exclude public and topic changeset from branch stack
Boris Feld <boris.feld@octobus.net>
parents: 2682
diff changeset
   307
90e11985d0cc topic: exclude public and topic changeset from branch stack
Boris Feld <boris.feld@octobus.net>
parents: 2682
diff changeset
   308
  $ hg topic --rev b4::b5 sometopic
90e11985d0cc topic: exclude public and topic changeset from branch stack
Boris Feld <boris.feld@octobus.net>
parents: 2682
diff changeset
   309
  changed topic on 2 changes
90e11985d0cc topic: exclude public and topic changeset from branch stack
Boris Feld <boris.feld@octobus.net>
parents: 2682
diff changeset
   310
  $ hg stack
2997
a61634f52742 topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2929
diff changeset
   311
  ### target: foo (branch)
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   312
  b3: c_h
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2997
diff changeset
   313
  b2: c_g
2684
90e11985d0cc topic: exclude public and topic changeset from branch stack
Boris Feld <boris.feld@octobus.net>
parents: 2682
diff changeset
   314
  b1@ c_D (current)
2712
f19b314d8475 topics: add t0 and b0 to the stack
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2691
diff changeset
   315
  b0^ c_c (base)