1278 $ hg debugobsolete --delete 1 --delete 3 |
1278 $ hg debugobsolete --delete 1 --delete 3 |
1279 deleted 2 obsolescence markers |
1279 deleted 2 obsolescence markers |
1280 $ hg debugobsolete |
1280 $ hg debugobsolete |
1281 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 \(.*\) {'user': 'test'} (re) |
1281 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 \(.*\) {'user': 'test'} (re) |
1282 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 \(.*\) {'user': 'test'} (re) |
1282 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 \(.*\) {'user': 'test'} (re) |
|
1283 |
|
1284 Test adding changeset after obsmarkers affecting it |
|
1285 (eg: during pull, or unbundle) |
|
1286 |
|
1287 $ mkcommit e |
|
1288 $ hg bundle -r . --base .~1 ../bundle-2.hg |
|
1289 1 changesets found |
|
1290 $ getid . |
|
1291 $ hg --config extensions.strip= strip -r . |
|
1292 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1293 saved backup bundle to $TESTTMP/tmpe/issue4845/doindexrev/.hg/strip-backup/9bc153528424-ee80edd4-backup.hg (glob) |
|
1294 $ hg debugobsolete 9bc153528424ea266d13e57f9ff0d799dfe61e4b |
|
1295 $ hg unbundle ../bundle-2.hg |
|
1296 adding changesets |
|
1297 adding manifests |
|
1298 adding file changes |
|
1299 added 1 changesets with 1 changes to 1 files |
|
1300 (run 'hg update' to get a working copy) |
|
1301 $ hg log -G |
|
1302 @ 7:7ae79c5d60f0 (draft) [tip ] dd |
|
1303 | |
|
1304 | o 6:4715cf767440 (draft) [ ] d |
|
1305 |/ |
|
1306 o 5:29346082e4a9 (draft) [ ] cc |
|
1307 | |
|
1308 o 3:d27fb9b06607 (draft) [ ] bb |
|
1309 | |
|
1310 | o 2:6fdef60fcbab (draft) [ ] b |
|
1311 |/ |
|
1312 o 1:f9bd49731b0b (draft) [ ] aa |
|
1313 |
|
1314 |
1283 $ cd .. |
1315 $ cd .. |
1284 |
|