Mercurial > evolve
view tests/test-push-checkheads-pruned-B6.t @ 5671:8c5f2c37b911
strip: remove experimental.prunestrip option
marmoute decided to drop it because it's "neither documented nor a good idea".
This extensions was assemble to deal with Facebook willingness to check `hg
strip` semantic for its user. Changing `hg strip` semantic is overall a pretty
bad idea, because `stripping` is a specific operation, that is problematic in
distributed version control but have a narrow set of valid usecase (eg:
maintenance). Diverting user away from `prune` in favor of a modified `strip` is
a bad idea, because it mask the legitimate `strip` usage and introduce confusion
in user heads, The verb is not appropriate and the behavior of `prunestrip` does
not match the one of vanillia `strip`.
Facebook is no longer using this, and the lack of documentation is a good hint
that nobody else is. So lets drop it.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Fri, 27 Nov 2020 09:47:01 +0800 |
parents | 196ed65594dc |
children | 8d20c0af010a fc60328270ac |
line wrap: on
line source
==================================== Testing head checking code: Case B-6 ==================================== Mercurial checks for the introduction of new heads on push. Evolution comes into play to detect if existing branches on the server are being replaced by some of the new one we push. This case is part of a series of tests checking this behavior. Category B: simple case involving pruned changesets TestCase 6: single changesets, pruned then superseded (on a new changeset) .. old-state: .. .. * 1 changeset branch .. .. new-state: .. .. * old branch is rewritten onto another one, .. * the new version is then pruned. .. .. expected-result: .. .. * push allowed .. .. graph-summary: .. .. A ø⇠⊗ A' .. | | .. | ◔ B .. |/ .. ● $ . $TESTDIR/testlib/push-checkheads-util.sh Test setup ---------- $ mkdir B6 $ cd B6 $ setuprepos creating basic server and client repo updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd client $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mkcommit B0 created new head $ mkcommit A1 $ hg up 'desc(B0)' 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"` 1 new obsolescence markers obsoleted 1 changesets $ hg debugobsolete --record-parents `getid "desc(A1)"` 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden x ba93660aff8d (draft): A1 | @ 74ff5441d343 (draft): B0 | | x 8aaa48160adc (draft): A0 |/ o 1e4be0697311 (public): root Actual testing -------------- $ hg push pushing to $TESTTMP/B6/server (glob) searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) 2 new obsolescence markers obsoleted 1 changesets $ cd ../..