annotate tests/test-bheads.out @ 6177:673d8a6bc709

Renamed "manifest" to "files" in web templates. manifest.tmpl is still used, so people having their own templates don't have to change them. "cmd=manifest" still works, new style URLs are not affected, because they already used "/file/".
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 26 Feb 2008 22:42:37 +0100
parents 25c372e8f261
children 4b0c9c674707
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
1 0: Adding root node
4648
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: 4649
diff changeset
3 0: Adding root node
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
4 =======
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
5 marked working directory as branch a
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
6 1: Adding a branch
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
7 -------
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
8 1: Adding a branch
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
9 =======
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
10 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
11 marked working directory as branch b
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
12 2: Adding b branch
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
13 1: Adding a branch
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
14 -------
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
15 2: Adding b branch
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
16 =======
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
17 3: Adding b branch head 1
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
18 1: Adding a branch
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
19 -------
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
20 3: Adding b branch head 1
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
21 =======
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
22 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
23 4: Adding b branch head 2
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
24 3: Adding b branch head 1
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
25 1: Adding a branch
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
26 -------
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
27 4: Adding b branch head 2
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
28 3: Adding b branch head 1
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
29 =======
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
30 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
31 5: Adding b branch head 3
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
32 4: Adding b branch head 2
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
33 3: Adding b branch head 1
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
34 1: Adding a branch
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
35 -------
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
36 5: Adding b branch head 3
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
37 4: Adding b branch head 2
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
38 3: Adding b branch head 1
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
39 =======
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
40 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
41 (branch merge, don't forget to commit)
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
42 6: 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: 4649
diff changeset
43 3: Adding b branch head 1
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
44 1: Adding a branch
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
45 -------
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
46 6: 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: 4649
diff changeset
47 3: Adding b branch head 1
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
48 =======
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
49 marked working directory as branch c
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
50 7: Adding c branch
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
51 3: Adding b branch head 1
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
52 1: Adding a branch
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
53 -------
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
54 7: Adding c branch
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
55 =======
4649
52259d5fb76d Small fixes for 8e503fa54d2d (hg heads branch)
Brendan Cully <brendan@kublai.com>
parents: 4648
diff changeset
56 no changes on branch c containing . are reachable from 3
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
57 1
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
58 -------
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
59 7: Adding c branch
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
60 0
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 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
63 0
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
64 -------
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
65 3: Adding b branch head 1
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
66 0
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
67 -------
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
68 3: Adding b branch head 1
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
69 6: Merging b branch head 2 and b branch head 3
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
70 0
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
71 -------
4649
52259d5fb76d Small fixes for 8e503fa54d2d (hg heads branch)
Brendan Cully <brendan@kublai.com>
parents: 4648
diff changeset
72 no changes on branch b containing . are reachable from 7
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
73 1
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
74 =======
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
75 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
76 7: Adding c branch
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
77 3: Adding b branch head 1
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
78 1: Adding a branch
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
79 -------
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
80 0: Adding root node
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
81 -------
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
82 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
83 7: Adding c branch
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
84 3: Adding b branch head 1
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
85 1: Adding a branch
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
86 -------
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
87 1: Adding a branch
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
88 -------
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
89 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
90 7: Adding c branch
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
91 3: Adding b branch head 1
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
92 1: Adding a branch
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
93 -------
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
94 6: 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: 4649
diff changeset
95 3: Adding b branch head 1
4648
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 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
98 7: Adding c branch
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
99 3: Adding b branch head 1
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
100 1: Adding a branch
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
101 -------
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
102 6: 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: 4649
diff changeset
103 3: Adding b branch head 1
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
104 -------
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
105 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
106 7: Adding c branch
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
107 3: Adding b branch head 1
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
108 1: Adding a branch
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
109 -------
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
110 6: 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: 4649
diff changeset
111 3: Adding b branch head 1
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
112 -------
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
113 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
114 7: Adding c branch
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
115 3: Adding b branch head 1
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
116 1: Adding a branch
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
117 -------
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
118 6: 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: 4649
diff changeset
119 3: Adding b branch head 1
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
120 -------
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
121 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
122 7: Adding c branch
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
123 3: Adding b branch head 1
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
124 1: Adding a branch
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
125 -------
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
126 6: 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: 4649
diff changeset
127 3: Adding b branch head 1
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
128 -------
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
129 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
130 7: Adding c branch
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
131 3: Adding b branch head 1
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
132 1: Adding a branch
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
133 -------
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
134 7: Adding c branch
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
135 -------
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
136 =======
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
137 1: Adding a branch
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
138 -------
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
139 6: 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: 4649
diff changeset
140 3: Adding b branch head 1
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
141 -------
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
142 7: Adding c branch
4648
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
143 -------
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
144 abort: unknown revision 'z'!
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
145 -------
8e503fa54d2d Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
146 =======
6127
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
147 0: Adding root node
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
148 1: Adding a branch
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
149 6: 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: 4649
diff changeset
150 3: Adding b branch head 1
25c372e8f261 Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4649
diff changeset
151 7: Adding c branch