Mercurial > hg
annotate tests/test-bheads.out @ 10274:04207f5e7344 stable
mq: Do not translate import message that are appended to commits.
We should not translate the "imported patch" message. The translated message
confuses the detection whether the user has not updated the commit message yet.
We try to avoid to translate generated commit messages.
author | David Soria Parra <dsp@php.net> |
---|---|
date | Wed, 20 Jan 2010 23:23:18 +0100 |
parents | c295a82a020b |
children | d8c0e6c43791 |
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 |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6127
diff
changeset
|
12 created new head |
6127
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
13 2: Adding b branch |
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
14 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
|
15 ------- |
6127
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
16 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
|
17 ======= |
6127
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
18 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
|
19 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
|
20 ------- |
6127
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
21 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
|
22 ======= |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
23 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6127
diff
changeset
|
24 created new head |
6127
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
25 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
|
26 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
|
27 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
|
28 ------- |
6127
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
29 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
|
30 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
|
31 ======= |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
32 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6127
diff
changeset
|
33 created new head |
6127
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
34 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
|
35 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
|
36 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
|
37 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
|
38 ------- |
6127
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
39 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
|
40 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
|
41 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
|
42 ======= |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
43 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
|
44 (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
|
45 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
|
46 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
|
47 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
|
48 ------- |
6127
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
49 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
|
50 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
|
51 ======= |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
52 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
|
53 7: Adding c branch |
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
54 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
|
55 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
|
56 ------- |
6127
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
57 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
|
58 ======= |
4649
52259d5fb76d
Small fixes for 8e503fa54d2d (hg heads branch)
Brendan Cully <brendan@kublai.com>
parents:
4648
diff
changeset
|
59 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
|
60 1 |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
61 ------- |
6127
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
62 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
|
63 0 |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
64 ------- |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
65 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
|
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 |
4648
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
69 0 |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
70 ------- |
9475
c295a82a020b
localrepo: fix bugs in branchheads and add docstring
Sune Foldager <cryo@cyanite.org>
parents:
6336
diff
changeset
|
71 6: Merging b branch head 2 and b branch head 3 |
6127
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
72 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
|
73 0 |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
74 ------- |
4649
52259d5fb76d
Small fixes for 8e503fa54d2d (hg heads branch)
Brendan Cully <brendan@kublai.com>
parents:
4648
diff
changeset
|
75 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
|
76 1 |
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 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
|
79 7: Adding c branch |
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
80 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
|
81 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
|
82 ------- |
6127
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
83 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
|
84 ------- |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
85 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
|
86 7: Adding c branch |
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
87 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
|
88 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
|
89 ------- |
6127
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
90 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
|
91 ------- |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
92 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
|
93 7: Adding c branch |
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
94 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
|
95 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
|
96 ------- |
6127
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
97 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
|
98 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
|
99 ------- |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
100 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
|
101 7: Adding c branch |
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
102 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
|
103 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
|
104 ------- |
6127
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
105 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
|
106 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
|
107 ------- |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
108 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
|
109 7: Adding c branch |
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
110 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
|
111 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
|
112 ------- |
6127
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
113 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
|
114 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
|
115 ------- |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
116 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
|
117 7: Adding c branch |
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
118 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
|
119 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
|
120 ------- |
6127
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
121 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
|
122 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
|
123 ------- |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
124 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
|
125 7: Adding c branch |
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
126 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
|
127 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
|
128 ------- |
6127
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
129 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
|
130 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
|
131 ------- |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
132 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
|
133 7: Adding c branch |
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
134 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
|
135 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
|
136 ------- |
6127
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
137 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
|
138 ------- |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
139 ======= |
6127
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
140 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
|
141 ------- |
6127
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
142 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
|
143 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
|
144 ------- |
6127
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
145 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
|
146 ------- |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
147 abort: unknown revision 'z'! |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
148 ------- |
8e503fa54d2d
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
149 ======= |
6127
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
150 0: Adding root node |
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
151 1: Adding a branch |
25c372e8f261
Simplify the output of test-bheads
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4649
diff
changeset
|
152 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
|
153 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
|
154 7: Adding c branch |