Mercurial > evolve

comparison tests/test-prune.t @ 4772:c6fc1000af1e mercurial-4.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.7 into mercurial-4.6
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 29 Jul 2019 11:40:22 +0200
parents fcecbb1261f2
children 7fe0be34f662 769b907e644e
comparison
equal deleted inserted replaced
4673:3ef4980353af 4772:c6fc1000af1e
227 bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} 227 bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
228 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} 228 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
229 814c38b95e72dfe2cbf675b1649ea9d780c89a80 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'} 229 814c38b95e72dfe2cbf675b1649ea9d780c89a80 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'}
230 354011cd103f58bbbd9091a3cee6d6a6bd0dddf7 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} 230 354011cd103f58bbbd9091a3cee6d6a6bd0dddf7 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
231 231
232 two old, two new with --pair 232 two old, two new with --pair (also test bookmark move)
233 233
234 $ hg up 0 234 $ hg up 0
235 0 files updated, 0 files merged, 4 files removed, 0 files unresolved 235 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
236 $ hg bookmark prune-pair-book
236 $ mkcommit n1 237 $ mkcommit n1
237 created new head 238 created new head
238 $ mkcommit n2 239 $ mkcommit n2
239 240
240 $ 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
241 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
242 working directory is now at 1f0dee641bb7 243 working directory is now at 6e8148413dd5
243 2 changesets pruned 244 2 changesets pruned
244 $ hg debugobsolete 245 $ hg debugobsolete
245 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'}
246 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'}
247 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'}
250 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} 251 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
251 814c38b95e72dfe2cbf675b1649ea9d780c89a80 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'} 252 814c38b95e72dfe2cbf675b1649ea9d780c89a80 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'}
252 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'}
253 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'}
254 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")'
257 14:21b6f2f1cece[] (obsolete/draft) add n2
258 12:6e8148413dd5[prune-pair-book] (draft) add nE
255 259
256 test hg strip replacement 260 test hg strip replacement
257 261
258 $ hg up 10 262 $ hg up 10
259 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
264 (leaving bookmark prune-pair-book)
260 $ mkcommit n1 265 $ mkcommit n1
261 created new head 266 created new head
262 $ mkcommit n2 267 $ mkcommit n2
263 $ hg --config extensions.strip= --config experimental.prunestrip=True strip -r . 268 $ hg --config extensions.strip= --config experimental.prunestrip=True strip -r .
264 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 269 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
452 B 8:d62d843c9a01 457 B 8:d62d843c9a01
453 * CELESTE 8:d62d843c9a01 458 * CELESTE 8:d62d843c9a01
454 r10 8:d62d843c9a01 459 r10 8:d62d843c9a01
455 rg 15:cd0038e05e1b 460 rg 15:cd0038e05e1b
456 461
462 $ cd ..
463
464 Test that prune doesn't update off when pruning unrelated commit (issue6137)
465 ----------------------------------------------------------------------------
466
467 $ hg init issue6137
468 $ cd issue6137
469 $ echo a > a
470 $ hg ci -Aqm "added a"
471 $ echo b > b
472 $ hg ci -Aqm "added b"
473
474 $ hg prune .
475 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
476 working directory is now at 9092f1db7931
477 1 changesets pruned
478
479 $ echo c > c
480 $ hg ci -Aqm "added c"
481
482 update to obsoleted revision and perform prune on unrelated revision:
483 $ hg up -r "desc('added b')" --hidden -q
484 updating to a hidden changeset 5f6d8a4bf34a
485 (hidden revision '5f6d8a4bf34a' is pruned)
486 working directory parent is obsolete! (5f6d8a4bf34a)
487
488 $ hg log -G
489 o 2:29edef26570b[] (draft) added c
490 |
491 | @ 1:5f6d8a4bf34a[] (obsolete/draft) added b
492 |/
493 o 0:9092f1db7931[] (draft) added a
494
495 $ hg prune -r "desc('added c')"
496 1 changesets pruned
497
498 $ hg par
499 1:5f6d8a4bf34a[] (obsolete/draft) added b
500 working directory parent is obsolete! (5f6d8a4bf34a)
501 (use 'hg evolve' to update to its parent successor)
502
503 $ cd ..