view tests/test-merge4.t @ 36620:186c6df3a373

py3: bulk-replace 'const char*' format specifier passed to PyArg_ParseTuple*()

Perhaps we need this because 's' accepts a unicode string.

https://docs.python.org/3/c-api/arg.html#strings-and-buffers

Substituted using the following pattern with some manual fixes:
  '\b(PyArg_ParseTuple)\((\s*\w+,\s*)"([^"]+)"'
  '\b(PyArg_ParseTupleAndKeywords)\((\s*\w+,\s*\w+,\s*)"([^"]+)"'

  $ 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]