view tests/test-absorb-strip.t @ 45956:40f79997e81f

rust: fix non-utf8 char in requirements.rs

Apparently Phabricator detect `rust/hg-core/src/requirements.rs` file as non
utf8 ‽, and mark it as binary.  During application it ended up being non-utf8
and this made Rust (and as a result heptapod) very angry::

    error: couldn't read hg-core/src/requirements.rs: stream did not contain valid UTF-8
      --> hg-core/src/lib.rs:11:9
       |
    11 | pub mod requirements;
       |         ^^^^^^^^^^^^

    error: aborting due to previous error

    error: could not compile `hg-core`.

The after "fixing", the file content has no character matching the following
regexp:

  [^0-9-a-zA-Z /(|).,{}!\[\]:"&=>?_*-;<`'#]

So we should be fine, unless Phabricator does something funny again.

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

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