tests/test-push-checkheads-superceed-A1.t
author Matt Harbison <matt_harbison@yahoo.com>
Wed, 06 Feb 2019 23:41:36 -0500
changeset 41608 67e622ade415
parent 35393 4441705b7111
child 42893 34a46d48d24e
permissions -rw-r--r--
tests: stabilize test-extdiff.t on Windows The test harness only wanted to drop the (windows !) lines, which also means the actual output matched the (no-windows !) lines. So drop those annotations too. I suspect if the output of the affected tests was actually collected on Windows, things were quoted because TEMPDIR contained a `~` in MSYS. Typically that happens when the username is 9 (8?) or more characters. I explicitly set TEMP and TMP to something short like "C:\temp" to avoid this, because otherwise there are a bunch of failures like this in other tests.

====================================
Testing head checking code: Case A-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 A: simple case involving a branch being superceeded by another.
TestCase 1: single-changeset branch

.. old-state:
..
.. * 1 changeset branch
..
.. new-state:
..
.. * 1 changeset branch succeeding to A
..
.. expected-result:
..
.. * push allowed
..
.. graph-summary:
..
..   A ø⇠◔ A'
..     |/
..     ●

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

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

  $ mkdir A1
  $ cd A1
  $ 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)"`
  obsoleted 1 changesets
  $ hg log -G --hidden
  @  f6082bc4ffef (draft): A1
  |
  | x  8aaa48160adc (draft): A0
  |/
  o  1e4be0697311 (public): root
  

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

  $ hg push
  pushing to $TESTTMP/A1/server
  searching for changes
  adding changesets
  adding manifests
  adding file changes
  added 1 changesets with 1 changes to 1 files (+1 heads)
  1 new obsolescence markers
  obsoleted 1 changesets

  $ cd ../..