view tests/test-merge4.t @ 17906:e83c482c6c5f stable

test-mq-qrefresh: adapt for Windows after 39b7052b217b

Fixes

  @@ -208,7 +208,7 @@
     $ echo 'orphan' > orphanchild
     $ hg add orphanchild
     $ hg qrefresh nonexistentfilename # clear patch
  -  nonexistentfilename: No such file or directory
  +  nonexistentfilename: The system cannot find the file specified
     $ hg qrefresh --short 1/base
     $ hg qrefresh --short 2/base

on Windows

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