Mercurial > hg
annotate tests/test-bheads.t @ 26228:0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
One of the things I missed the most when transitioning from versioned MQ to
evolve was the loss of being able to check that rebase conflicts were properly
resolved by:
$ hg ci --mq -m "before"
$ hg rebase -s qbase -d tip
$ hg bcompare --mq
The old csets stay in the tree with evolve, but a straight diff includes all of
the other changes that were pulled in, obscuring the code that was rebased.
Diffing deltas can be confusing, but unless radical changes were made during the
resolve, it is very clear when individual hunks are added, dropped or modified.
Unlike the MQ technique, this can only compare a single pair of csets/patches at
a time. Like the MQ method, this also highlights changes in the commit comment
and other metadata.
I originally tried monkey patching from the evolve extension, but that is too
complicated given that it depends on the order the two different extensions are
loaded. This functionality is also useful when comparing grafts however, so
implementing it in the core is more than just convenience.
The --change argument doesn't make much sense for this, but it isn't harmful so
I didn't bother blocking it. The -I/-X options are ignored because of a
limitation of cmdutil.export(). We'll fix that next.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Wed, 09 Sep 2015 21:07:38 -0400 |
parents | 701df761aa94 |
children | 95c4cca641f6 |
rev | line source |
---|---|
12072
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
1 $ heads() |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
2 > { |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
3 > hg heads --template '{rev}: {desc|firstline|strip} ({branches})\n' "$@" |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
4 > } |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
5 |
12072
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
6 $ hg init a |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
7 $ cd a |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
8 $ echo 'root' >root |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
9 $ hg add root |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
10 $ hg commit -m "Adding root node" |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
11 $ heads |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
12 0: Adding root node () |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
13 ------- |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
14 $ heads . |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
15 0: Adding root node () |
6127
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4648
diff
changeset
|
16 |
12072
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
17 ======= |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
18 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
19 $ echo 'a' >a |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
20 $ hg add a |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
21 $ hg branch a |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
22 marked working directory as branch a |
15615 | 23 (branches are permanent and global, did you want a bookmark?) |
12072
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
24 $ hg commit -m "Adding a branch" |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
25 $ heads |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
26 1: Adding a branch (a) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
27 0: Adding root node () |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
28 ------- |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
29 $ heads . |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
30 1: Adding a branch (a) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
31 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
32 ======= |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
33 |
12072
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
34 $ hg update -C 0 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
35 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
36 $ echo 'b' >b |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
37 $ hg add b |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
38 $ hg branch b |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
39 marked working directory as branch b |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
40 $ hg commit -m "Adding b branch" |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
41 $ heads |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
42 2: Adding b branch (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
43 1: Adding a branch (a) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
44 0: Adding root node () |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
45 ------- |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
46 $ heads . |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
47 2: Adding b branch (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
48 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
49 ======= |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
50 |
12072
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
51 $ echo 'bh1' >bh1 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
52 $ hg add bh1 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
53 $ hg commit -m "Adding b branch head 1" |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
54 $ heads |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
55 3: Adding b branch head 1 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
56 1: Adding a branch (a) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
57 0: Adding root node () |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
58 ------- |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
59 $ heads . |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
60 3: Adding b branch head 1 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
61 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
62 ======= |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
63 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
64 $ hg update -C 2 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
65 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
66 $ echo 'bh2' >bh2 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
67 $ hg add bh2 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
68 $ hg commit -m "Adding b branch head 2" |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
69 created new head |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
70 $ heads |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
71 4: Adding b branch head 2 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
72 3: Adding b branch head 1 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
73 1: Adding a branch (a) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
74 0: Adding root node () |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
75 $ heads . |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
76 4: Adding b branch head 2 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
77 3: Adding b branch head 1 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
78 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
79 ======= |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
80 |
12072
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
81 $ hg update -C 2 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
82 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
83 $ echo 'bh3' >bh3 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
84 $ hg add bh3 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
85 $ hg commit -m "Adding b branch head 3" |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
86 created new head |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
87 $ heads |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
88 5: Adding b branch head 3 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
89 4: Adding b branch head 2 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
90 3: Adding b branch head 1 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
91 1: Adding a branch (a) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
92 0: Adding root node () |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
93 ------- |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
94 $ heads . |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
95 5: Adding b branch head 3 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
96 4: Adding b branch head 2 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
97 3: Adding b branch head 1 (b) |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
98 |
12072
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
99 ======= |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
100 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
101 $ hg merge 4 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
102 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
103 (branch merge, don't forget to commit) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
104 $ hg commit -m "Merging b branch head 2 and b branch head 3" |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
105 $ heads |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
106 6: Merging b branch head 2 and b branch head 3 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
107 3: Adding b branch head 1 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
108 1: Adding a branch (a) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
109 0: Adding root node () |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
110 ------- |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
111 $ heads . |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
112 6: Merging b branch head 2 and b branch head 3 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
113 3: Adding b branch head 1 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
114 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
115 ======= |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
116 |
12072
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
117 $ echo 'c' >c |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
118 $ hg add c |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
119 $ hg branch c |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
120 marked working directory as branch c |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
121 $ hg commit -m "Adding c branch" |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
122 $ heads |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
123 7: Adding c branch (c) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
124 6: Merging b branch head 2 and b branch head 3 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
125 3: Adding b branch head 1 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
126 1: Adding a branch (a) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
127 0: Adding root node () |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
128 ------- |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
129 $ heads . |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
130 7: Adding c branch (c) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
131 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
132 ======= |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
133 |
12072
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
134 $ heads -r 3 . |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
135 no open branch heads found on branches c (started at 3) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12072
diff
changeset
|
136 [1] |
12072
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
137 $ heads -r 2 . |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
138 7: Adding c branch (c) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
139 ------- |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
140 $ hg update -C 4 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
141 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
142 ------- |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
143 $ heads -r 3 . |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
144 3: Adding b branch head 1 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
145 ------- |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
146 $ heads -r 2 . |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
147 6: Merging b branch head 2 and b branch head 3 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
148 3: Adding b branch head 1 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
149 ------- |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
150 $ heads -r 7 . |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
151 no open branch heads found on branches b (started at 7) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12072
diff
changeset
|
152 [1] |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
153 |
12072
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
154 ======= |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
155 |
12072
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
156 $ for i in 0 1 2 3 4 5 6 7; do |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
157 > hg update -C "$i" |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
158 > heads |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
159 > echo '-------' |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
160 > heads . |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
161 > echo '-------' |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
162 > done |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
163 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
164 7: Adding c branch (c) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
165 6: Merging b branch head 2 and b branch head 3 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
166 3: Adding b branch head 1 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
167 1: Adding a branch (a) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
168 0: Adding root node () |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
169 ------- |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
170 0: Adding root node () |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
171 ------- |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
172 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
173 7: Adding c branch (c) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
174 6: Merging b branch head 2 and b branch head 3 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
175 3: Adding b branch head 1 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
176 1: Adding a branch (a) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
177 0: Adding root node () |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
178 ------- |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
179 1: Adding a branch (a) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
180 ------- |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
181 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
182 7: Adding c branch (c) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
183 6: Merging b branch head 2 and b branch head 3 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
184 3: Adding b branch head 1 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
185 1: Adding a branch (a) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
186 0: Adding root node () |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
187 ------- |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
188 6: Merging b branch head 2 and b branch head 3 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
189 3: Adding b branch head 1 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
190 ------- |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
191 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
192 7: Adding c branch (c) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
193 6: Merging b branch head 2 and b branch head 3 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
194 3: Adding b branch head 1 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
195 1: Adding a branch (a) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
196 0: Adding root node () |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
197 ------- |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
198 6: Merging b branch head 2 and b branch head 3 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
199 3: Adding b branch head 1 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
200 ------- |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
201 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
202 7: Adding c branch (c) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
203 6: Merging b branch head 2 and b branch head 3 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
204 3: Adding b branch head 1 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
205 1: Adding a branch (a) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
206 0: Adding root node () |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
207 ------- |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
208 6: Merging b branch head 2 and b branch head 3 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
209 3: Adding b branch head 1 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
210 ------- |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
211 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
212 7: Adding c branch (c) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
213 6: Merging b branch head 2 and b branch head 3 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
214 3: Adding b branch head 1 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
215 1: Adding a branch (a) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
216 0: Adding root node () |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
217 ------- |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
218 6: Merging b branch head 2 and b branch head 3 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
219 3: Adding b branch head 1 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
220 ------- |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
221 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
222 7: Adding c branch (c) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
223 6: Merging b branch head 2 and b branch head 3 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
224 3: Adding b branch head 1 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
225 1: Adding a branch (a) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
226 0: Adding root node () |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
227 ------- |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
228 6: Merging b branch head 2 and b branch head 3 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
229 3: Adding b branch head 1 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
230 ------- |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
231 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
232 7: Adding c branch (c) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
233 6: Merging b branch head 2 and b branch head 3 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
234 3: Adding b branch head 1 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
235 1: Adding a branch (a) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
236 0: Adding root node () |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
237 ------- |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
238 7: Adding c branch (c) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
239 ------- |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
240 |
12072
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
241 ======= |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
242 |
12072
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
243 $ for i in a b c z; do |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
244 > heads "$i" |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
245 > echo '-------' |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
246 > done |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
247 1: Adding a branch (a) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
248 ------- |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
249 6: Merging b branch head 2 and b branch head 3 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
250 3: Adding b branch head 1 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
251 ------- |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
252 7: Adding c branch (c) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
253 ------- |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
254 abort: unknown revision 'z'! |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
255 ------- |
11318
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
10350
diff
changeset
|
256 |
12072
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
257 ======= |
11318
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
10350
diff
changeset
|
258 |
12072
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
259 $ heads 0 1 2 3 4 5 6 7 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
260 7: Adding c branch (c) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
261 6: Merging b branch head 2 and b branch head 3 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
262 3: Adding b branch head 1 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
263 1: Adding a branch (a) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
264 0: Adding root node () |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
265 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
266 Topological heads: |
11318
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
10350
diff
changeset
|
267 |
12072
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
268 $ heads -t |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
269 7: Adding c branch (c) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
270 3: Adding b branch head 1 (b) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
271 1: Adding a branch (a) |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
272 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
273 $ cd .. |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
274 ______________ |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
275 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
276 "created new head" message tests |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
277 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
278 $ hg init newheadmsg |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
279 $ cd newheadmsg |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
280 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
281 Init: no msg |
11318
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
10350
diff
changeset
|
282 |
12072
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
283 $ echo 1 > a |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
284 $ hg ci -Am "a0: Initial root" |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
285 adding a |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
286 $ echo 2 >> a |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
287 $ hg ci -m "a1 (HN)" |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
288 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
289 $ hg branch b |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
290 marked working directory as branch b |
15615 | 291 (branches are permanent and global, did you want a bookmark?) |
12072
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
292 $ echo 1 > b |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
293 $ hg ci -Am "b2: Initial root for branch b" |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
294 adding b |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
295 $ echo 2 >> b |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
296 $ hg ci -m "b3 (HN)" |
11318
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
10350
diff
changeset
|
297 |
12072
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
298 Case NN: msg |
11318
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
10350
diff
changeset
|
299 |
12072
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
300 $ hg up -q null |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
301 $ hg branch -f b |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
302 marked working directory as branch b |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
303 $ echo 1 > bb |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
304 $ hg ci -Am "b4 (NN): new topo root for branch b" |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
305 adding bb |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
306 created new head |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
307 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
308 Case HN: no msg |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
309 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
310 $ echo 2 >> bb |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
311 $ hg ci -m "b5 (HN)" |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
312 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
313 Case BN: msg |
11318
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
10350
diff
changeset
|
314 |
12072
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
315 $ hg branch -f default |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
316 marked working directory as branch default |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
317 $ echo 1 > aa |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
318 $ hg ci -Am "a6 (BN): new branch root" |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
319 adding aa |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
320 created new head |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
321 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
322 Case CN: msg |
11318
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
10350
diff
changeset
|
323 |
12072
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
324 $ hg up -q 4 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
325 $ echo 3 >> bbb |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
326 $ hg ci -Am "b7 (CN): regular new head" |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
327 adding bbb |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
328 created new head |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
329 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
330 Case BB: msg |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
331 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
332 $ hg up -q 4 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
333 $ hg merge -q 3 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
334 $ hg branch -f default |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
335 marked working directory as branch default |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
336 $ hg ci -m "a8 (BB): weird new branch root" |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
337 created new head |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
338 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
339 Case CB: msg |
11318
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
10350
diff
changeset
|
340 |
12072
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
341 $ hg up -q 4 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
342 $ hg merge -q 1 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
343 $ hg ci -m "b9 (CB): new head from branch merge" |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
344 created new head |
11318
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
10350
diff
changeset
|
345 |
12072
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
346 Case HB: no msg |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
347 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
348 $ hg up -q 7 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
349 $ hg merge -q 6 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
350 $ hg ci -m "b10 (HB): continuing head from branch merge" |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
351 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
352 Case CC: msg |
11318
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
10350
diff
changeset
|
353 |
12072
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
354 $ hg up -q 4 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
355 $ hg merge -q 2 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
356 $ hg ci -m "b11 (CC): new head from merge" |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
357 created new head |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
358 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
359 Case CH: no msg |
11318
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
10350
diff
changeset
|
360 |
12072
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
361 $ hg up -q 2 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
362 $ hg merge -q 10 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
363 $ hg ci -m "b12 (CH): continuing head from merge" |
11318
7d780c04f074
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr>
parents:
10350
diff
changeset
|
364 |
12072
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
365 Case HH: no msg |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
366 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
367 $ hg merge -q 3 |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
368 $ hg ci -m "b12 (HH): merging two heads" |
010025717202
tests: unify test-bheads
Adrian Buehlmann <adrian@cadifra.com>
parents:
11543
diff
changeset
|
369 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15615
diff
changeset
|
370 $ cd .. |