##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

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