tests/test-bheads
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Thu, 15 Jul 2010 21:44:51 +0200
changeset 11578 bb7af1de5e38
parent 11543 0a2762d83c53
permissions -rwxr-xr-x
discovery: remove duplication for new remote head discovery
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
     1
#!/bin/sh
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
     2
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
     3
heads()
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
     4
{
10350
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8523
diff changeset
     5
    hg heads --template '{rev}: {desc|firstline|strip} ({branches})\n' "$@"
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
     6
}
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
     7
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
     8
hg init a
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
     9
cd a
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    10
echo 'root' >root
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    11
hg add root
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
    12
hg commit -m "Adding root node"
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
    13
heads
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    14
echo '-------'
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
    15
heads .
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    16
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    17
echo '======='
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    18
echo 'a' >a
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    19
hg add a
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    20
hg branch a
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
    21
hg commit -m "Adding a branch"
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
    22
heads
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    23
echo '-------'
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
    24
heads .
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    25
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    26
echo '======='
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    27
hg update -C 0
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    28
echo 'b' >b
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    29
hg add b
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    30
hg branch b
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
    31
hg commit -m "Adding b branch"
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
    32
heads
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    33
echo '-------'
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
    34
heads .
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    35
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    36
echo '======='
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    37
echo 'bh1' >bh1
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    38
hg add bh1
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
    39
hg commit -m "Adding b branch head 1"
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
    40
heads
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    41
echo '-------'
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
    42
heads .
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    43
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    44
echo '======='
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    45
hg update -C 2
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    46
echo 'bh2' >bh2
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    47
hg add bh2
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
    48
hg commit -m "Adding b branch head 2"
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
    49
heads
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    50
echo '-------'
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
    51
heads .
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    52
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    53
echo '======='
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    54
hg update -C 2
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    55
echo 'bh3' >bh3
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    56
hg add bh3
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
    57
hg commit -m "Adding b branch head 3"
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
    58
heads
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    59
echo '-------'
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
    60
heads .
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    61
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    62
echo '======='
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    63
hg merge 4
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
    64
hg commit -m "Merging b branch head 2 and b branch head 3"
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
    65
heads
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    66
echo '-------'
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
    67
heads .
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    68
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    69
echo '======='
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    70
echo 'c' >c
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    71
hg add c
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    72
hg branch c
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
    73
hg commit -m "Adding c branch"
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
    74
heads
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    75
echo '-------'
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
    76
heads .
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    77
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    78
echo '======='
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
    79
heads -r 3 .
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    80
echo $?
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    81
echo '-------'
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
    82
heads -r 2 .
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    83
echo $?
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    84
echo '-------'
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    85
hg update -C 4
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    86
echo $?
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    87
echo '-------'
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
    88
heads -r 3 .
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    89
echo $?
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    90
echo '-------'
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
    91
heads -r 2 .
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    92
echo $?
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    93
echo '-------'
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
    94
heads -r 7 .
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    95
echo $?
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    96
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    97
echo '======='
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    98
for i in 0 1 2 3 4 5 6 7; do
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
    99
    hg update -C "$i"
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
   100
    heads
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   101
    echo '-------'
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
   102
    heads .
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   103
    echo '-------'
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   104
done
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   105
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   106
echo '======='
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   107
for i in a b c z; do
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
   108
    heads "$i"
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   109
    echo '-------'
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   110
done
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   111
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
   112
echo '======='
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4648
diff changeset
   113
heads 0 1 2 3 4 5 6 7
10350
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8523
diff changeset
   114
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8523
diff changeset
   115
echo '% topological heads'
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8523
diff changeset
   116
heads -t
11318
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   117
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   118
echo '______________'
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   119
cd ..
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   120
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   121
hg init newheadmsg
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   122
cd newheadmsg
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   123
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   124
echo '% created new head message'
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   125
echo '% init: no msg'
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   126
echo 1 > a
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   127
hg ci -Am "a0: Initial root"
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   128
echo 2 >> a
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   129
hg ci -m "a1 (HN)"
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   130
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   131
hg branch b
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   132
echo 1 > b
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   133
hg ci -Am "b2: Initial root for branch b"
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   134
echo 2 >> b
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   135
hg ci -m "b3 (HN)"
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   136
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   137
echo '% case NN: msg'
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   138
hg up -q null
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   139
hg branch -f b
11543
0a2762d83c53 test-bheads: use a case-insensitive set of filenames (issue2274)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11318
diff changeset
   140
echo 1 > bb
11318
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   141
hg ci -Am "b4 (NN): new topo root for branch b"
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   142
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   143
echo '% case HN: no msg'
11543
0a2762d83c53 test-bheads: use a case-insensitive set of filenames (issue2274)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11318
diff changeset
   144
echo 2 >> bb
11318
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   145
hg ci -m "b5 (HN)"
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   146
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   147
echo '% case BN: msg'
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   148
hg branch -f default
11543
0a2762d83c53 test-bheads: use a case-insensitive set of filenames (issue2274)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11318
diff changeset
   149
echo 1 > aa
11318
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   150
hg ci -Am "a6 (BN): new branch root"
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   151
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   152
echo '% case CN: msg'
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   153
hg up -q 4
11543
0a2762d83c53 test-bheads: use a case-insensitive set of filenames (issue2274)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11318
diff changeset
   154
echo 3 >> bbb
11318
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   155
hg ci -Am "b7 (CN): regular new head"
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   156
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   157
echo '% case BB: msg'
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   158
hg up -q 4
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   159
hg merge -q 3
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   160
hg branch -f default
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   161
hg ci -m "a8 (BB): weird new branch root"
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   162
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   163
echo '% case CB: msg'
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   164
hg up -q 4
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   165
hg merge -q 1
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   166
hg ci -m "b9 (CB): new head from branch merge"
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   167
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   168
echo '% case HB: no msg'
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   169
hg up -q 7
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   170
hg merge -q 6
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   171
hg ci -m "b10 (HB): continuing head from branch merge"
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   172
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   173
echo '% case CC: msg'
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   174
hg up -q 4
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   175
hg merge -q 2
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   176
hg ci -m "b11 (CC): new head from merge"
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   177
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   178
echo '% case CH: no msg'
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   179
hg up -q 2
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   180
hg merge -q 10
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   181
hg ci -m "b12 (CH): continuing head from merge"
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   182
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   183
echo '% case HH: no msg'
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   184
hg merge -q 3
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   185
hg ci -m "b12 (HH): merging two heads"
7d780c04f074 commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents: 10350
diff changeset
   186