view tests/test-absorb-strip.t @ 43699:21e05aabef8c

hghave: add a check for the `xz` compression utility

This isn't install by default on Mac, which causes a test failure.  The logic
for avoiding the command is a little goofy, but nested `#if` isn't supported,
and it still seems worth running the hg command to see if anything explodes.

With this, the py3 tests run (almost) cleanly on 10.14.6:

    # Ran 835 tests, 58 skipped, 1 failed.

Alas, the mac-packaging test is skipped because it's slow.  The failure here is
in test-releasenotes-merging.t, complaining about not being able to import the
`fuzzywuzzy` module.  I have it installed on py3 (thus the test isn't skipped),
but not on py2.  So there must be some unintended cross pollination here when
running `hg` commands.

Differential Revision: https://phab.mercurial-scm.org/D7374

Do not strip innocent children. See https://bitbucket.org/facebook/hg-experimental/issues/6/hg-absorb-merges-diverged-commits

  $ cat >> $HGRCPATH << EOF
  > [extensions]
  > absorb=
  > drawdag=$TESTDIR/drawdag.py
  > EOF

  $ hg init
  $ hg debugdrawdag << EOF
  > E
  > |
  > D F
  > |/
  > C
  > |
  > B
  > |
  > A
  > EOF

  $ hg up E -q
  $ echo 1 >> B
  $ echo 2 >> D
  $ hg absorb -a
  warning: orphaned descendants detected, not stripping 112478962961, 26805aba1e60
  saved backup bundle to * (glob)
  2 of 2 chunk(s) applied

  $ hg log -G -T '{desc}'
  @  E
  |
  o  D
  |
  o  C
  |
  o  B
  |
  | o  F
  | |
  | o  C
  | |
  | o  B
  |/
  o  A