##// END OF EJS Templates
test: add isolated prune case (to test-obsolete-bundle-strip.t)...
marmoute -
r32491:f2116efd default
parent child Browse files
Show More
@@ -1,375 +1,413
1 1 ==================================================
2 2 Test obsmarkers interaction with bundle and strip
3 3 ==================================================
4 4
5 5 In practice, this file does not yet contains any tests for bundle and strip.
6 6 But their will be some soon (tm).
7 7
8 8 For now this test check the logic computing markers relevant to a set of
9 9 revision. That logic will be use by "hg bundle" to select the markers to
10 10 include, and strip to find the markers to backup.
11 11
12 12 Setup a repository with various case
13 13 ====================================
14 14
15 15 Config setup
16 16 ------------
17 17
18 18 $ cat >> $HGRCPATH <<EOF
19 19 > [ui]
20 20 > # simpler log output
21 21 > logtemplate = "{node|short}: {desc}\n"
22 22 >
23 23 > [experimental]
24 24 > # enable evolution
25 25 > evolution = all
26 26 >
27 27 > # include obsmarkers in bundle
28 28 > evolution.bundle-obsmarker = yes
29 29 >
30 30 > [extensions]
31 31 > # needed for some tests
32 32 > strip =
33 33 > [defaults]
34 34 > # we'll query many hidden changeset
35 35 > debugobsolete = --hidden
36 36 > EOF
37 37
38 38 $ mkcommit() {
39 39 > echo "$1" > "$1"
40 40 > hg add "$1"
41 41 > hg ci -m "$1"
42 42 > }
43 43
44 44 $ getid() {
45 45 > hg log --hidden --template '{node}\n' --rev "$1"
46 46 > }
47 47
48 48 $ mktestrepo () {
49 49 > [ -n "$1" ] || exit 1
50 50 > cd $TESTTMP
51 51 > hg init $1
52 52 > cd $1
53 53 > mkcommit ROOT
54 54 > }
55 55
56 56 root setup
57 57 -------------
58 58
59 59 simple chain
60 60 ============
61 61
62 62 . A0
63 63 . β‡ ΓΈβ‡ β—” A1
64 64 . |/
65 65 . ●
66 66
67 67 setup
68 68 -----
69 69
70 70 $ mktestrepo simple-chain
71 71 $ mkcommit 'C-A0'
72 72 $ hg up 'desc("ROOT")'
73 73 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
74 74 $ mkcommit 'C-A1'
75 75 created new head
76 76 $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`
77 77 $ hg debugobsolete `getid 'desc("C-A0")'` a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1
78 78 $ hg debugobsolete a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 `getid 'desc("C-A1")'`
79 79
80 80 $ hg up 'desc("ROOT")'
81 81 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
82 82 $ hg log --hidden -G
83 83 o cf2c22470d67: C-A1
84 84 |
85 85 | x 84fcb0dfe17b: C-A0
86 86 |/
87 87 @ ea207398892e: ROOT
88 88
89 89 $ hg debugobsolete
90 90 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
91 91 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
92 92 a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
93 93
94 94 Actual testing
95 95 --------------
96 96
97 97 $ hg debugobsolete --rev 'desc("C-A0")'
98 98 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
99 99 $ hg debugobsolete --rev 'desc("C-A1")'
100 100 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
101 101 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
102 102 a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
103 103
104 104 chain with prune children
105 105 =========================
106 106
107 107 . β‡ βŠ— B0
108 108 . |
109 109 . β‡ ΓΈβ‡ β—” A1
110 110 . |
111 111 . ●
112 112
113 113 setup
114 114 -----
115 115
116 116 $ mktestrepo prune
117 117 $ mkcommit 'C-A0'
118 118 $ mkcommit 'C-B0'
119 119 $ hg up 'desc("ROOT")'
120 120 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
121 121 $ mkcommit 'C-A1'
122 122 created new head
123 123 $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`
124 124 $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'`
125 125 $ hg debugobsolete --record-parents `getid 'desc("C-B0")'`
126 126 $ hg up 'desc("ROOT")'
127 127 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
128 128 $ hg log --hidden -G
129 129 o cf2c22470d67: C-A1
130 130 |
131 131 | x 29f93b1df87b: C-B0
132 132 | |
133 133 | x 84fcb0dfe17b: C-A0
134 134 |/
135 135 @ ea207398892e: ROOT
136 136
137 137 $ hg debugobsolete
138 138 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
139 139 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
140 140 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
141 141
142 142 Actual testing
143 143 --------------
144 144
145 145 $ hg debugobsolete --rev 'desc("C-A0")'
146 146 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
147 147 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
148 148 $ hg debugobsolete --rev 'desc("C-B0")'
149 149 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
150 150 $ hg debugobsolete --rev 'desc("C-A1")'
151 151 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
152 152 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
153 153 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
154 154
155 155 chain with precursors also pruned
156 156 =================================
157 157
158 158 . A0 (also pruned)
159 159 . β‡ ΓΈβ‡ β—” A1
160 160 . |
161 161 . ●
162 162
163 163 setup
164 164 -----
165 165
166 166 $ mktestrepo prune-inline
167 167 $ mkcommit 'C-A0'
168 168 $ hg up 'desc("ROOT")'
169 169 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
170 170 $ mkcommit 'C-A1'
171 171 created new head
172 172 $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`
173 173 $ hg debugobsolete --record-parents `getid 'desc("C-A0")'`
174 174 $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'`
175 175 $ hg up 'desc("ROOT")'
176 176 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
177 177 $ hg log --hidden -G
178 178 o cf2c22470d67: C-A1
179 179 |
180 180 | x 84fcb0dfe17b: C-A0
181 181 |/
182 182 @ ea207398892e: ROOT
183 183
184 184 $ hg debugobsolete
185 185 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
186 186 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
187 187 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
188 188
189 189 Actual testing
190 190 --------------
191 191
192 192 $ hg debugobsolete --rev 'desc("C-A0")'
193 193 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
194 194 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
195 195 $ hg debugobsolete --rev 'desc("C-A1")'
196 196 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
197 197 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
198 198 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
199 199
200 200 chain with missing prune
201 201 ========================
202 202
203 203 . βŠ— B
204 204 . |
205 205 . β‡ β—Œβ‡ β—” A1
206 206 . |
207 207 . ●
208 208
209 209 setup
210 210 -----
211 211
212 212 $ mktestrepo missing-prune
213 213 $ mkcommit 'C-A0'
214 214 $ mkcommit 'C-B0'
215 215 $ hg up 'desc("ROOT")'
216 216 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
217 217 $ mkcommit 'C-A1'
218 218 created new head
219 219 $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`
220 220 $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'`
221 221 $ hg debugobsolete --record-parents `getid 'desc("C-B0")'`
222 222
223 223 (it is annoying to create prune with parent data without the changeset, so we strip it after the fact)
224 224
225 225 $ hg strip --hidden --rev 'desc("C-A0")::' --no-backup
226 226
227 227 $ hg up 'desc("ROOT")'
228 228 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
229 229 $ hg log --hidden -G
230 230 o cf2c22470d67: C-A1
231 231 |
232 232 @ ea207398892e: ROOT
233 233
234 234 $ hg debugobsolete
235 235 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
236 236 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
237 237 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
238 238
239 239 Actual testing
240 240 --------------
241 241
242 242 $ hg debugobsolete --rev 'desc("C-A1")'
243 243 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
244 244 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
245 245 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
246 246
247 247 chain with precursors also pruned
248 248 =================================
249 249
250 250 . A0 (also pruned)
251 251 . β‡ β—Œβ‡ β—” A1
252 252 . |
253 253 . ●
254 254
255 255 setup
256 256 -----
257 257
258 258 $ mktestrepo prune-inline-missing
259 259 $ mkcommit 'C-A0'
260 260 $ hg up 'desc("ROOT")'
261 261 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
262 262 $ mkcommit 'C-A1'
263 263 created new head
264 264 $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`
265 265 $ hg debugobsolete --record-parents `getid 'desc("C-A0")'`
266 266 $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'`
267 267
268 268 (it is annoying to create prune with parent data without the changeset, so we strip it after the fact)
269 269
270 270 $ hg strip --hidden --rev 'desc("C-A0")::' --no-backup
271 271
272 272 $ hg up 'desc("ROOT")'
273 273 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
274 274 $ hg log --hidden -G
275 275 o cf2c22470d67: C-A1
276 276 |
277 277 @ ea207398892e: ROOT
278 278
279 279 $ hg debugobsolete
280 280 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
281 281 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
282 282 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
283 283
284 284 Actual testing
285 285 --------------
286 286
287 287 $ hg debugobsolete --rev 'desc("C-A1")'
288 288 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
289 289 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
290 290 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
291 291
292 292 Chain with fold and split
293 293 =========================
294 294
295 295 setup
296 296 -----
297 297
298 298 $ mktestrepo split-fold
299 299 $ mkcommit 'C-A'
300 300 $ hg up 'desc("ROOT")'
301 301 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
302 302 $ mkcommit 'C-B'
303 303 created new head
304 304 $ hg up 'desc("ROOT")'
305 305 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
306 306 $ mkcommit 'C-C'
307 307 created new head
308 308 $ hg up 'desc("ROOT")'
309 309 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
310 310 $ mkcommit 'C-D'
311 311 created new head
312 312 $ hg up 'desc("ROOT")'
313 313 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
314 314 $ mkcommit 'C-E'
315 315 created new head
316 316 $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A")'`
317 317 $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-B")'` `getid 'desc("C-C")'` # record split
318 318 $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-D")'` # other divergent
319 319 $ hg debugobsolete `getid 'desc("C-A")'` b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0
320 320 $ hg debugobsolete b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 `getid 'desc("C-E")'`
321 321 $ hg debugobsolete `getid 'desc("C-B")'` `getid 'desc("C-E")'`
322 322 $ hg debugobsolete `getid 'desc("C-C")'` `getid 'desc("C-E")'`
323 323 $ hg debugobsolete `getid 'desc("C-D")'` `getid 'desc("C-E")'`
324 324 $ hg debugobsolete c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 `getid 'desc("C-E")'`
325 325
326 326 $ hg up 'desc("ROOT")'
327 327 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
328 328 $ hg log --hidden -G
329 329 o 2f20ff6509f0: C-E
330 330 |
331 331 | x 06dc9da25ef0: C-D
332 332 |/
333 333 | x 27ec657ca21d: C-C
334 334 |/
335 335 | x a9b9da38ed96: C-B
336 336 |/
337 337 | x 9ac430e15fca: C-A
338 338 |/
339 339 @ ea207398892e: ROOT
340 340
341 341 $ hg debugobsolete
342 342 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
343 343 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
344 344 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
345 345 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
346 346 b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
347 347 a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
348 348 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
349 349 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
350 350 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
351 351
352 352 Actual testing
353 353 --------------
354 354
355 355 $ hg debugobsolete --rev 'desc("C-A")'
356 356 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
357 357 $ hg debugobsolete --rev 'desc("C-B")'
358 358 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
359 359 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
360 360 $ hg debugobsolete --rev 'desc("C-C")'
361 361 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
362 362 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
363 363 $ hg debugobsolete --rev 'desc("C-D")'
364 364 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
365 365 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
366 366 $ hg debugobsolete --rev 'desc("C-E")'
367 367 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
368 368 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
369 369 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
370 370 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
371 371 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
372 372 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
373 373 a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
374 374 b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
375 375 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
376
377 changeset pruned on its own
378 ===========================
379
380 . βŠ— B
381 . |
382 . β—• A
383 . |
384 . ●
385
386 setup
387 -----
388
389 $ mktestrepo lonely-prune
390 $ hg up 'desc("ROOT")'
391 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
392 $ mkcommit 'C-A'
393 $ mkcommit 'C-B'
394 $ hg debugobsolete --record-parent `getid 'desc("C-B")'`
395
396 $ hg up 'desc("ROOT")'
397 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
398 $ hg log --hidden -G
399 x cefb651fc2fd: C-B
400 |
401 o 9ac430e15fca: C-A
402 |
403 @ ea207398892e: ROOT
404
405 $ hg debugobsolete
406 cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
407
408 Actual testing
409 --------------
410 $ hg debugobsolete --rev 'desc("C-A")'
411 cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
412 $ hg debugobsolete --hidden --rev 'desc("C-B")'
413 cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
General Comments 0
You need to be logged in to leave comments. Login now