view tests/test-update-renames.t @ 28611:6aa17f86d9f0

test-hgrc: do not print ui.plain() flag at uisetup()

This makes the test pass with chg. Since uisetup() is run per process,
"hg showconfig" does not always call uisetup().

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]