##// END OF EJS Templates
test-obsolete-bundle-strip: add cases with prune on missing revs...
marmoute -
r32489:248f68c4 default
parent child Browse files
Show More
@@ -196,3 +196,95 b' Actual testing'
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
200 chain with missing prune
201 ========================
202
203 . ⊗ B
204 . |
205 . ⇠◌⇠◔ A1
206 . |
207 . ●
208
209 setup
210 -----
211
212 $ mktestrepo missing-prune
213 $ mkcommit 'C-A0'
214 $ mkcommit 'C-B0'
215 $ hg up 'desc("ROOT")'
216 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
217 $ mkcommit 'C-A1'
218 created new head
219 $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`
220 $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'`
221 $ hg debugobsolete --record-parents `getid 'desc("C-B0")'`
222
223 (it is annoying to create prune with parent data without the changeset, so we strip it after the fact)
224
225 $ hg strip --hidden --rev 'desc("C-A0")::' --no-backup
226
227 $ hg up 'desc("ROOT")'
228 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
229 $ hg log --hidden -G
230 o cf2c22470d67: C-A1
231 |
232 @ ea207398892e: ROOT
233
234 $ hg debugobsolete
235 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
236 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
237 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
238
239 Actual testing
240 --------------
241
242 $ hg debugobsolete --rev 'desc("C-A1")'
243 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
244 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
245 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
246
247 chain with precursors also pruned
248 =================================
249
250 . A0 (also pruned)
251 . ⇠◌⇠◔ A1
252 . |
253 . ●
254
255 setup
256 -----
257
258 $ mktestrepo prune-inline-missing
259 $ mkcommit 'C-A0'
260 $ hg up 'desc("ROOT")'
261 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
262 $ mkcommit 'C-A1'
263 created new head
264 $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`
265 $ hg debugobsolete --record-parents `getid 'desc("C-A0")'`
266 $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'`
267
268 (it is annoying to create prune with parent data without the changeset, so we strip it after the fact)
269
270 $ hg strip --hidden --rev 'desc("C-A0")::' --no-backup
271
272 $ hg up 'desc("ROOT")'
273 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
274 $ hg log --hidden -G
275 o cf2c22470d67: C-A1
276 |
277 @ ea207398892e: ROOT
278
279 $ hg debugobsolete
280 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
281 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
282 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
283
284 Actual testing
285 --------------
286
287 $ hg debugobsolete --rev 'desc("C-A1")'
288 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
289 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
290 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
General Comments 0
You need to be logged in to leave comments. Login now