237 $ mkcommit n1 |
237 $ mkcommit n1 |
238 created new head |
238 created new head |
239 $ mkcommit n2 |
239 $ mkcommit n2 |
240 |
240 |
241 $ hg prune 'desc("add n1")::desc("add n2")' -s 'desc("add nD")::desc("add nE")' --pair |
241 $ hg prune 'desc("add n1")::desc("add n2")' -s 'desc("add nD")::desc("add nE")' --pair |
242 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
242 4 files updated, 0 files merged, 2 files removed, 0 files unresolved |
243 working directory is now at 1f0dee641bb7 |
243 working directory is now at 6e8148413dd5 |
244 2 changesets pruned |
244 2 changesets pruned |
245 $ hg debugobsolete |
245 $ hg debugobsolete |
246 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'blah'} |
246 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'blah'} |
247 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
247 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
248 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
248 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
253 354011cd103f58bbbd9091a3cee6d6a6bd0dddf7 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} |
253 354011cd103f58bbbd9091a3cee6d6a6bd0dddf7 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} |
254 cb7f8f706a6532967b98cf8583a81baab79a0fa7 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} |
254 cb7f8f706a6532967b98cf8583a81baab79a0fa7 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} |
255 21b6f2f1cece8c10326e575dd38239189d467190 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} |
255 21b6f2f1cece8c10326e575dd38239189d467190 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} |
256 $ hg log --hidden -r 'desc("add n2") + desc("add nE") + bookmark("prune-pair-book")' |
256 $ hg log --hidden -r 'desc("add n2") + desc("add nE") + bookmark("prune-pair-book")' |
257 14:21b6f2f1cece[] (obsolete/draft) add n2 |
257 14:21b6f2f1cece[] (obsolete/draft) add n2 |
258 12:6e8148413dd5[] (draft) add nE |
258 12:6e8148413dd5[prune-pair-book] (draft) add nE |
259 0:1f0dee641bb7[BABAR prune-pair-book] (public) add a |
|
260 |
259 |
261 test hg strip replacement |
260 test hg strip replacement |
262 |
261 |
263 $ hg up 10 |
262 $ hg up 10 |
264 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
263 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
265 (leaving bookmark prune-pair-book) |
264 (leaving bookmark prune-pair-book) |
266 $ mkcommit n1 |
265 $ mkcommit n1 |
267 created new head |
266 created new head |
268 $ mkcommit n2 |
267 $ mkcommit n2 |
269 $ hg --config extensions.strip= --config experimental.prunestrip=True strip -r . |
268 $ hg --config extensions.strip= --config experimental.prunestrip=True strip -r . |