##// END OF EJS Templates
Remove dummy branch hack from tests
Matt Mackall -
r4180:f80cf8b7 default
parent child Browse files
Show More
@@ -1,7 +1,6 b''
1 1 #!/bin/sh
2 2
3 3 hg init
4 hg branch dummy # needed so -r "" doesn't point to the unnamed/default branch
5 4 touch a
6 5 hg add a
7 6 hg ci -m "a" -d "1000000 0"
@@ -1,19 +1,19 b''
1 diff -r 4da5fa99f904 b
1 diff -r acd8075edac9 b
2 2 --- /dev/null
3 3 +++ b/b
4 4 @@ -0,0 +1,1 @@
5 5 +123
6 diff -r 4da5fa99f904 b
6 diff -r acd8075edac9 b
7 7 --- /dev/null
8 8 +++ b/b
9 9 @@ -0,0 +1,1 @@
10 10 +123
11 diff -r 4da5fa99f904 a
11 diff -r acd8075edac9 a
12 12 --- a/a
13 13 +++ b/a
14 14 @@ -0,0 +1,1 @@
15 15 +foo
16 diff -r 4da5fa99f904 b
16 diff -r acd8075edac9 b
17 17 --- /dev/null
18 18 +++ b/b
19 19 @@ -0,0 +1,1 @@
@@ -47,7 +47,6 b' hg log -pv d'
47 47 # log --follow tests
48 48 hg init ../follow
49 49 cd ../follow
50 hg branch dummy # needed so -r "" doesn't point to the unnamed/default branch
51 50 echo base > base
52 51 hg ci -Ambase -d '1 0'
53 52
@@ -105,22 +105,19 b' adding base'
105 105 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
106 106 adding b1
107 107 % log -f
108 changeset: 3:07a62f044f0d
109 branch: dummy
108 changeset: 3:e62f78d544b4
110 109 tag: tip
111 parent: 1:fb3d4e35b279
110 parent: 1:3d5bf5654eda
112 111 user: test
113 112 date: Thu Jan 01 00:00:01 1970 +0000
114 113 summary: b1
115 114
116 changeset: 1:fb3d4e35b279
117 branch: dummy
115 changeset: 1:3d5bf5654eda
118 116 user: test
119 117 date: Thu Jan 01 00:00:01 1970 +0000
120 118 summary: r1
121 119
122 changeset: 0:ea445bfed6b9
123 branch: dummy
120 changeset: 0:67e992f2c4f3
124 121 user: test
125 122 date: Thu Jan 01 00:00:01 1970 +0000
126 123 summary: base
@@ -128,21 +125,18 b' summary: base'
128 125 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
129 126 adding b2
130 127 % log -f -r 1:tip
131 changeset: 1:fb3d4e35b279
132 branch: dummy
128 changeset: 1:3d5bf5654eda
133 129 user: test
134 130 date: Thu Jan 01 00:00:01 1970 +0000
135 131 summary: r1
136 132
137 changeset: 2:e8882cbc828c
138 branch: dummy
133 changeset: 2:60c670bf5b30
139 134 user: test
140 135 date: Thu Jan 01 00:00:01 1970 +0000
141 136 summary: r2
142 137
143 changeset: 3:07a62f044f0d
144 branch: dummy
145 parent: 1:fb3d4e35b279
138 changeset: 3:e62f78d544b4
139 parent: 1:3d5bf5654eda
146 140 user: test
147 141 date: Thu Jan 01 00:00:01 1970 +0000
148 142 summary: b1
@@ -151,66 +145,57 b' 2 files updated, 0 files merged, 1 files'
151 145 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
152 146 (branch merge, don't forget to commit)
153 147 % log --follow-first
154 changeset: 6:0f621dafa603
155 branch: dummy
148 changeset: 6:2404bbcab562
156 149 tag: tip
157 150 user: test
158 151 date: Thu Jan 01 00:00:01 1970 +0000
159 152 summary: b1.1
160 153
161 changeset: 5:0cf53fb6dfd5
162 branch: dummy
163 parent: 3:07a62f044f0d
164 parent: 4:b76598590bc3
154 changeset: 5:302e9dd6890d
155 parent: 3:e62f78d544b4
156 parent: 4:ddb82e70d1a1
165 157 user: test
166 158 date: Thu Jan 01 00:00:01 1970 +0000
167 159 summary: m12
168 160
169 changeset: 3:07a62f044f0d
170 branch: dummy
171 parent: 1:fb3d4e35b279
161 changeset: 3:e62f78d544b4
162 parent: 1:3d5bf5654eda
172 163 user: test
173 164 date: Thu Jan 01 00:00:01 1970 +0000
174 165 summary: b1
175 166
176 changeset: 1:fb3d4e35b279
177 branch: dummy
167 changeset: 1:3d5bf5654eda
178 168 user: test
179 169 date: Thu Jan 01 00:00:01 1970 +0000
180 170 summary: r1
181 171
182 changeset: 0:ea445bfed6b9
183 branch: dummy
172 changeset: 0:67e992f2c4f3
184 173 user: test
185 174 date: Thu Jan 01 00:00:01 1970 +0000
186 175 summary: base
187 176
188 177 % log -P 2
189 changeset: 6:0f621dafa603
190 branch: dummy
178 changeset: 6:2404bbcab562
191 179 tag: tip
192 180 user: test
193 181 date: Thu Jan 01 00:00:01 1970 +0000
194 182 summary: b1.1
195 183
196 changeset: 5:0cf53fb6dfd5
197 branch: dummy
198 parent: 3:07a62f044f0d
199 parent: 4:b76598590bc3
184 changeset: 5:302e9dd6890d
185 parent: 3:e62f78d544b4
186 parent: 4:ddb82e70d1a1
200 187 user: test
201 188 date: Thu Jan 01 00:00:01 1970 +0000
202 189 summary: m12
203 190
204 changeset: 4:b76598590bc3
205 branch: dummy
206 parent: 0:ea445bfed6b9
191 changeset: 4:ddb82e70d1a1
192 parent: 0:67e992f2c4f3
207 193 user: test
208 194 date: Thu Jan 01 00:00:01 1970 +0000
209 195 summary: b2
210 196
211 changeset: 3:07a62f044f0d
212 branch: dummy
213 parent: 1:fb3d4e35b279
197 changeset: 3:e62f78d544b4
198 parent: 1:3d5bf5654eda
214 199 user: test
215 200 date: Thu Jan 01 00:00:01 1970 +0000
216 201 summary: b1
General Comments 0
You need to be logged in to leave comments. Login now