view tests/test-issue619.t @ 13537:37f487b9fbcc

test-rename-merge1: make it easier to review, windows friendly

- Reuse the coding style of the previous tests, both are very similar
- Do not play with case changes, it does not work on Windows

http://mercurial.selenic.com/bts/issue619

  $ hg init
  $ echo a > a
  $ hg ci -Ama
  adding a

  $ echo b > b
  $ hg branch b
  marked working directory as branch b
  $ hg ci -Amb
  adding b

  $ hg co -C 0
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved

Fast-forward:

  $ hg merge b
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  (branch merge, don't forget to commit)
  $ hg branch
  default
  $ hg parent --template '{rev}:{node|short} {branches}: {desc}\n'
  1:06c2121185be b: b
  $ hg ci -Ammerge
  created new head

Bogus fast-forward should fail:

  $ hg merge b
  abort: merging with a working directory ancestor has no effect
  [255]