view tests/test-update-renames.t @ 29140:47eab0cb72e3

hghave: matchoutput needs to use bytes for regexp file output is bytes in py3, so we need each regexp to be bytes
author timeless <timeless@mozdev.org>
date Thu, 05 May 2016 09:07:01 +0000
parents ef1eb6df7071
children
line wrap: on
line source

Test update logic when there are renames

Update with local changes across a file rename

  $ hg init

  $ echo a > a
  $ hg add a
  $ hg ci -m a

  $ hg mv a b
  $ hg ci -m rename

  $ echo b > b
  $ hg ci -m change

  $ hg up -q 0

  $ echo c > a

  $ hg up
  merging a and b to b
  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
  use 'hg resolve' to retry unresolved file merges
  [1]