comparison tests/test-up-local-change.t @ 23477:689540e6007e stable

update: add tests for untracked local file

We don't seem to have any tests for updating to another revision when
there are untracked files on the local side that conflict with the
those on the remote side, so let's add tests. This shows how we
overwrite untracked ignored files when updating to a revision that
tracks the file.

23440:57d35d3c1cf1

  +++ b/a
  @@ -1,1 +1,1 @@
  -a2
  +abc


test a local add

  $ cd ..
  $ hg init a

23477:689540e6007e

  +++ b/a
  @@ -1,1 +1,1 @@
  -a2
  +abc


test conflicting untracked files

  $ hg up -qC 0
  $ echo untracked > b
  $ hg st
  ? b
  $ hg up 1
  b: untracked file differs
  abort: untracked files in working directory differ from files in requested revision
  [255]
  $ rm b

test conflicting untracked ignored file

BROKEN: the ignored file gets overwritten by the remote version

  $ hg up -qC 0
  $ echo ignored > .hgignore
  $ hg add .hgignore
  $ hg ci -m 'add .hgignore'
  created new head
  $ echo ignored > ignored
  $ hg add ignored
  $ hg ci -m 'add ignored file'

  $ hg up -q 'desc("add .hgignore")'
  $ echo untracked > ignored
  $ hg st
  $ hg up 'desc("add ignored file")'
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ cat ignored
  ignored

test a local add

  $ cd ..
  $ hg init a