##// END OF EJS Templates
test-debugbuilddag: replace unneeded 'rm -rf' with 'rm -r'
Martin Geisler -
r14278:59c820a6 default
parent child Browse files
Show More
@@ -1,313 +1,307 b''
1 1 $ echo "[extensions]" >> $HGRCPATH
2 2 $ echo "graphlog=" >> $HGRCPATH
3 3
4 4 plain
5 5
6 $ rm -rf repo
7 $ hg init repo
8 $ cd repo
6 $ hg init
9 7 $ hg debugbuilddag '+2:f +3:p2 @temp <f+4 @default /p2 +2'
10 8 tags
11 9 $ cat .hg/localtags
12 10 66f7d451a68b85ed82ff5fcc254daf50c74144bd f
13 11 bebd167eb94d257ace0e814aeb98e6972ed2970d p2
14 12 dag
15 13 $ hg debugdag -t -b
16 14 +2:f
17 15 +3:p2
18 16 @temp*f+3
19 17 @default*/p2+2:tip
20 18 tip
21 19 $ hg id
22 20 000000000000
23 21 glog
24 22 $ hg glog --template '{rev}: {desc} [{branches}] @ {date}\n'
25 23 o 11: r11 [] @ 11.00
26 24 |
27 25 o 10: r10 [] @ 10.00
28 26 |
29 27 o 9: r9 [] @ 9.00
30 28 |\
31 29 | o 8: r8 [temp] @ 8.00
32 30 | |
33 31 | o 7: r7 [temp] @ 7.00
34 32 | |
35 33 | o 6: r6 [temp] @ 6.00
36 34 | |
37 35 | o 5: r5 [temp] @ 5.00
38 36 | |
39 37 o | 4: r4 [] @ 4.00
40 38 | |
41 39 o | 3: r3 [] @ 3.00
42 40 | |
43 41 o | 2: r2 [] @ 2.00
44 42 |/
45 43 o 1: r1 [] @ 1.00
46 44 |
47 45 o 0: r0 [] @ 0.00
48 46
49 47
50 48 overwritten files
51 49
52 $ rm -rf repo
53 $ hg init repo
54 $ cd repo
50 $ rm -r .hg
51 $ hg init
55 52 $ hg debugbuilddag '+2:f +3:p2 @temp <f+4 @default /p2 +2' -q -o
56 53 tags
57 54 $ cat .hg/localtags
58 55 2a8ed67d317e370eac733dccc501b12d7b9c441a f
59 56 4226a30965b7af58f94d0cda7e6c2c9c63e6bf90 p2
60 57 dag
61 58 $ hg debugdag -t -b
62 59 +2:f
63 60 +3:p2
64 61 @temp*f+3
65 62 @default*/p2+2:tip
66 63 tip
67 64 $ hg id
68 65 000000000000
69 66 glog
70 67 $ hg glog --template '{rev}: {desc} [{branches}] @ {date}\n'
71 68 o 11: r11 [] @ 11.00
72 69 |
73 70 o 10: r10 [] @ 10.00
74 71 |
75 72 o 9: r9 [] @ 9.00
76 73 |\
77 74 | o 8: r8 [temp] @ 8.00
78 75 | |
79 76 | o 7: r7 [temp] @ 7.00
80 77 | |
81 78 | o 6: r6 [temp] @ 6.00
82 79 | |
83 80 | o 5: r5 [temp] @ 5.00
84 81 | |
85 82 o | 4: r4 [] @ 4.00
86 83 | |
87 84 o | 3: r3 [] @ 3.00
88 85 | |
89 86 o | 2: r2 [] @ 2.00
90 87 |/
91 88 o 1: r1 [] @ 1.00
92 89 |
93 90 o 0: r0 [] @ 0.00
94 91
95 92 glog of
96 93 $ hg glog --template '{rev}: {desc} [{branches}]\n' of
97 94 o 11: r11 []
98 95 |
99 96 o 10: r10 []
100 97 |
101 98 o 9: r9 []
102 99 |\
103 100 | o 8: r8 [temp]
104 101 | |
105 102 | o 7: r7 [temp]
106 103 | |
107 104 | o 6: r6 [temp]
108 105 | |
109 106 | o 5: r5 [temp]
110 107 | |
111 108 o | 4: r4 []
112 109 | |
113 110 o | 3: r3 []
114 111 | |
115 112 o | 2: r2 []
116 113 |/
117 114 o 1: r1 []
118 115 |
119 116 o 0: r0 []
120 117
121 118 tags
122 119 $ hg tags -v
123 120 tip 11:58a51e5eb988
124 121 p2 4:4226a30965b7 local
125 122 f 1:2a8ed67d317e local
126 123 cat of
127 124 $ hg cat of --rev tip
128 125 r11
129 $ cd ..
130 126
131 127
132 128 new and mergeable files
133 129
134 $ rm -rf repo
135 $ hg init repo
136 $ cd repo
130 $ rm -r .hg
131 $ hg init
137 132 $ hg debugbuilddag '+2:f +3:p2 @temp <f+4 @default /p2 +2' -q -mn
138 133 dag
139 134 $ hg debugdag -t -b
140 135 +2:f
141 136 +3:p2
142 137 @temp*f+3
143 138 @default*/p2+2:tip
144 139 tip
145 140 $ hg id
146 141 000000000000
147 142 glog
148 143 $ hg glog --template '{rev}: {desc} [{branches}] @ {date}\n'
149 144 o 11: r11 [] @ 11.00
150 145 |
151 146 o 10: r10 [] @ 10.00
152 147 |
153 148 o 9: r9 [] @ 9.00
154 149 |\
155 150 | o 8: r8 [temp] @ 8.00
156 151 | |
157 152 | o 7: r7 [temp] @ 7.00
158 153 | |
159 154 | o 6: r6 [temp] @ 6.00
160 155 | |
161 156 | o 5: r5 [temp] @ 5.00
162 157 | |
163 158 o | 4: r4 [] @ 4.00
164 159 | |
165 160 o | 3: r3 [] @ 3.00
166 161 | |
167 162 o | 2: r2 [] @ 2.00
168 163 |/
169 164 o 1: r1 [] @ 1.00
170 165 |
171 166 o 0: r0 [] @ 0.00
172 167
173 168 glog mf
174 169 $ hg glog --template '{rev}: {desc} [{branches}]\n' mf
175 170 o 11: r11 []
176 171 |
177 172 o 10: r10 []
178 173 |
179 174 o 9: r9 []
180 175 |\
181 176 | o 8: r8 [temp]
182 177 | |
183 178 | o 7: r7 [temp]
184 179 | |
185 180 | o 6: r6 [temp]
186 181 | |
187 182 | o 5: r5 [temp]
188 183 | |
189 184 o | 4: r4 []
190 185 | |
191 186 o | 3: r3 []
192 187 | |
193 188 o | 2: r2 []
194 189 |/
195 190 o 1: r1 []
196 191 |
197 192 o 0: r0 []
198 193
199 194
200 195 man r4
201 196 $ hg manifest -r4
202 197 mf
203 198 nf0
204 199 nf1
205 200 nf2
206 201 nf3
207 202 nf4
208 203 cat r4 mf
209 204 $ hg cat -r4 mf
210 205 0 r0
211 206 1
212 207 2 r1
213 208 3
214 209 4 r2
215 210 5
216 211 6 r3
217 212 7
218 213 8 r4
219 214 9
220 215 10
221 216 11
222 217 12
223 218 13
224 219 14
225 220 15
226 221 16
227 222 17
228 223 18
229 224 19
230 225 20
231 226 21
232 227 22
233 228 23
234 229 man r8
235 230 $ hg manifest -r8
236 231 mf
237 232 nf0
238 233 nf1
239 234 nf5
240 235 nf6
241 236 nf7
242 237 nf8
243 238 cat r8 mf
244 239 $ hg cat -r8 mf
245 240 0 r0
246 241 1
247 242 2 r1
248 243 3
249 244 4
250 245 5
251 246 6
252 247 7
253 248 8
254 249 9
255 250 10 r5
256 251 11
257 252 12 r6
258 253 13
259 254 14 r7
260 255 15
261 256 16 r8
262 257 17
263 258 18
264 259 19
265 260 20
266 261 21
267 262 22
268 263 23
269 264 man
270 265 $ hg manifest --rev tip
271 266 mf
272 267 nf0
273 268 nf1
274 269 nf10
275 270 nf11
276 271 nf2
277 272 nf3
278 273 nf4
279 274 nf5
280 275 nf6
281 276 nf7
282 277 nf8
283 278 nf9
284 279 cat mf
285 280 $ hg cat mf --rev tip
286 281 0 r0
287 282 1
288 283 2 r1
289 284 3
290 285 4 r2
291 286 5
292 287 6 r3
293 288 7
294 289 8 r4
295 290 9
296 291 10 r5
297 292 11
298 293 12 r6
299 294 13
300 295 14 r7
301 296 15
302 297 16 r8
303 298 17
304 299 18 r9
305 300 19
306 301 20 r10
307 302 21
308 303 22 r11
309 304 23
310 $ cd ..
311 305
312 306
313 307
General Comments 0
You need to be logged in to leave comments. Login now