view tests/test-merge8.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

Test for changeset ba7c74081861
(update dirstate correctly for non-branchmerge updates)
  $ hg init a
  $ cd a
  $ echo a > a
  $ hg add a
  $ hg commit -m a
  $ cd ..
  $ hg clone a b
  updating to branch default
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ cd a
  $ hg mv a b
  $ hg commit -m move
  $ echo b >> b
  $ hg commit -m b
  $ cd ../b
  $ hg pull ../a
  pulling from ../a
  searching for changes
  adding changesets
  adding manifests
  adding file changes
  added 2 changesets with 2 changes to 1 files
  new changesets e3c9b40284e1:772b37f1ca37
  (run 'hg update' to get a working copy)
  $ hg update
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ cd ..