view tests/test-merge4.t @ 40269:52b773f5e9a4

tests: replace `cd ..` with an absolute path in a couple ssh tests

These tests are broken under py3 on Windows to the point where the `cd ..` was
actually escaping into the system wide $TEMP.  The subsequent `hg init` created
a repo there, and then added a local extension to the hgrc.  This breaks every
single subsequent test when it tries to `hg init` in its $TESTTMP, and can't
load the localwrite.py extension.  And since I botched this the first time and
replaced the wrong `cd ..`, this just replaces all of them.  I've noticed test
garbage in $TEMP recently, and maybe this will help.

Perhaps `hg init` shouldn't load the config for the local repo, but this is an
easy enough workaround for now.

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