view tests/test-merge4.t @ 42458:8ee0fdf3b087

rust-cpython: fix build for MacOSX

MacOSX needs special link flags. Quoting the README of rust-cpython:

  create a `.cargo/config` with the following content:

  ```
  [target.x86_64-apple-darwin]
  rustflags = [
    "-C", "link-arg=-undefined",
    "-C", "link-arg=dynamic_lookup",
  ]
  ```

This is tested with Python 2.7 (Anaconda install) and Python 3
(Homebrew install)

  $ hg init
  $ echo This is file a1 > a
  $ hg add a
  $ hg commit -m "commit #0"
  $ echo This is file b1 > b
  $ hg add b
  $ hg commit -m "commit #1"
  $ hg update 0
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  $ echo This is file c1 > c
  $ hg add c
  $ hg commit -m "commit #2"
  created new head
  $ hg merge 1
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  (branch merge, don't forget to commit)
  $ rm b
  $ echo This is file c22 > c

Test hg behaves when committing with a missing file added by a merge

  $ hg commit -m "commit #3"
  abort: cannot commit merge with missing files
  [255]