1319 |
1319 |
1320 |
1320 |
1321 $ hg strip --hidden -r 2 --config extensions.strip= --config devel.strip-obsmarkers=no |
1321 $ hg strip --hidden -r 2 --config extensions.strip= --config devel.strip-obsmarkers=no |
1322 saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e008cf283490-ede36964-backup.hg (glob) |
1322 saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e008cf283490-ede36964-backup.hg (glob) |
1323 $ hg debugobsolete |
1323 $ hg debugobsolete |
1324 e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (*) {'user': 'test'} (glob) |
1324 e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
1325 $ hg log -G |
1325 $ hg log -G |
1326 @ 2:b0551702f918 (draft) [tip ] 2 |
1326 @ 2:b0551702f918 (draft) [tip ] 2 |
1327 | |
1327 | |
1328 o 1:e016b03fd86f (draft) [ ] 1 |
1328 o 1:e016b03fd86f (draft) [ ] 1 |
1329 | |
1329 | |
1346 $ hg pull .hg/strip-backup/e008cf283490-*-backup.hg |
1346 $ hg pull .hg/strip-backup/e008cf283490-*-backup.hg |
1347 pulling from .hg/strip-backup/e008cf283490-ede36964-backup.hg |
1347 pulling from .hg/strip-backup/e008cf283490-ede36964-backup.hg |
1348 searching for changes |
1348 searching for changes |
1349 no changes found |
1349 no changes found |
1350 $ hg debugobsolete |
1350 $ hg debugobsolete |
1351 e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (*) {'user': 'test'} (glob) |
1351 e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
1352 $ hg log -G |
1352 $ hg log -G |
1353 @ 2:b0551702f918 (draft) [tip ] 2 |
1353 @ 2:b0551702f918 (draft) [tip ] 2 |
1354 | |
1354 | |
1355 o 1:e016b03fd86f (draft) [ ] 1 |
1355 o 1:e016b03fd86f (draft) [ ] 1 |
1356 | |
1356 | |
1380 Stream params: {Compression: BZ} |
1380 Stream params: {Compression: BZ} |
1381 changegroup -- {nbchanges: 2, version: 02} |
1381 changegroup -- {nbchanges: 2, version: 02} |
1382 e016b03fd86fcccc54817d120b90b751aaf367d6 |
1382 e016b03fd86fcccc54817d120b90b751aaf367d6 |
1383 b0551702f918510f01ae838ab03a463054c67b46 |
1383 b0551702f918510f01ae838ab03a463054c67b46 |
1384 obsmarkers -- {} |
1384 obsmarkers -- {} |
1385 version: 1 (70 bytes) |
1385 version: 1 (86 bytes) |
1386 e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
1386 e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
1387 phase-heads -- {} |
1387 phase-heads -- {} |
1388 b0551702f918510f01ae838ab03a463054c67b46 draft |
1388 b0551702f918510f01ae838ab03a463054c67b46 draft |
1389 |
1389 |
1390 $ hg unbundle .hg/strip-backup/e016b03fd86f-*-backup.hg |
1390 $ hg unbundle .hg/strip-backup/e016b03fd86f-*-backup.hg |
1391 adding changesets |
1391 adding changesets |
1393 adding file changes |
1393 adding file changes |
1394 added 2 changesets with 2 changes to 2 files |
1394 added 2 changesets with 2 changes to 2 files |
1395 1 new obsolescence markers |
1395 1 new obsolescence markers |
1396 (run 'hg update' to get a working copy) |
1396 (run 'hg update' to get a working copy) |
1397 $ hg debugobsolete | sort |
1397 $ hg debugobsolete | sort |
1398 e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (*) {'user': 'test'} (glob) |
1398 e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
1399 $ hg log -G |
1399 $ hg log -G |
1400 o 2:b0551702f918 (draft) [tip ] 2 |
1400 o 2:b0551702f918 (draft) [tip ] 2 |
1401 | |
1401 | |
1402 o 1:e016b03fd86f (draft) [ ] 1 |
1402 o 1:e016b03fd86f (draft) [ ] 1 |
1403 | |
1403 | |
1429 $ echo d > d |
1429 $ echo d > d |
1430 $ hg ci -Am d |
1430 $ hg ci -Am d |
1431 adding d |
1431 adding d |
1432 $ hg ci --amend -m dd --config experimental.stabilization.track-operation=1 |
1432 $ hg ci --amend -m dd --config experimental.stabilization.track-operation=1 |
1433 $ hg debugobsolete --index --rev "3+7" |
1433 $ hg debugobsolete --index --rev "3+7" |
1434 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 \(.*\) {'user': 'test'} (re) |
1434 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
1435 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 \(.*\) {'operation': 'amend', 'user': 'test'} (re) |
1435 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 \(.*\) {'operation': 'amend', 'user': 'test'} (re) |
1436 $ hg debugobsolete --index --rev "3+7" -Tjson |
1436 $ hg debugobsolete --index --rev "3+7" -Tjson |
1437 [ |
1437 [ |
1438 { |
1438 { |
1439 "date": [0.0, 0], |
1439 "date": [0.0, 0], |
1440 "flag": 0, |
1440 "flag": 0, |
1441 "index": 1, |
1441 "index": 1, |
1442 "metadata": {"user": "test"}, |
1442 "metadata": {"operation": "amend", "user": "test"}, |
1443 "prednode": "6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1", |
1443 "prednode": "6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1", |
1444 "succnodes": ["d27fb9b066076fd921277a4b9e8b9cb48c95bc6a"] |
1444 "succnodes": ["d27fb9b066076fd921277a4b9e8b9cb48c95bc6a"] |
1445 }, |
1445 }, |
1446 { |
1446 { |
1447 "date": [0.0, 0], |
1447 "date": [0.0, 0], |
1453 } |
1453 } |
1454 ] |
1454 ] |
1455 |
1455 |
1456 Test the --delete option of debugobsolete command |
1456 Test the --delete option of debugobsolete command |
1457 $ hg debugobsolete --index |
1457 $ hg debugobsolete --index |
1458 0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
1458 0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
1459 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
1459 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
1460 2 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
1460 2 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
1461 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
1461 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
1462 $ hg debugobsolete --delete 1 --delete 3 |
1462 $ hg debugobsolete --delete 1 --delete 3 |
1463 deleted 2 obsolescence markers |
1463 deleted 2 obsolescence markers |
1464 $ hg debugobsolete |
1464 $ hg debugobsolete |
1465 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
1465 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
1466 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
1466 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
1467 |
1467 |
1468 Test adding changeset after obsmarkers affecting it |
1468 Test adding changeset after obsmarkers affecting it |
1469 (eg: during pull, or unbundle) |
1469 (eg: during pull, or unbundle) |
1470 |
1470 |
1471 $ mkcommit e |
1471 $ mkcommit e |