view tests/test-push-checkheads-unpushed-D1.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 a8ff17479fb8
children f3e39a354378 12c53d7122a7
line wrap: on
line source

====================================
Testing head checking code: Case D-1
====================================

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 D: remote head is "obs-affected" locally, but result is not part of the push
TestCase 1: remote head is rewritten, but successors is not part of the push

.. old-state:
..
.. * 1 changeset branch
..
.. new-state:
..
.. * 1 changeset branch succeeding the old branch
.. * 1 new unrelated branch
..
.. expected-result:
..
.. * pushing only the unrelated branch: denied
..
.. graph-summary:
..
..   A ø⇠○ A'
..     |/
..     | ◔ B
..     |/
..     ●

  $ . $TESTDIR/testlib/push-checkheads-util.sh

Test setup
----------

  $ mkdir D1
  $ cd D1
  $ 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 A1
  created new head
  $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
  1 new obsolescence markers
  obsoleted 1 changesets
  $ hg up 0
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  $ mkcommit B0
  created new head
  $ hg log -G --hidden
  @  74ff5441d343 (draft): B0
  |
  | o  f6082bc4ffef (draft): A1
  |/
  | x  8aaa48160adc (draft): A0
  |/
  o  1e4be0697311 (public): root
  

Actual testing
--------------

  $ hg push -r 'desc(B0)'
  pushing to $TESTTMP/D1/server (glob)
  searching for changes
  abort: push creates new remote head 74ff5441d343!
  (merge or see 'hg help push' for details about pushing new heads)
  [255]

  $ cd ../..