comparison tests/test-pathconflicts-basic.t @ 34552:33c8a6837181

merge: check for path conflicts when updating (issue5628)

When updating to a new revision, check for path conflicts caused by unknown
files in the working directory, and handle these by backing up the file or
directory and replacing it.

Differential Revision: https://phab.mercurial-scm.org/D781

34551:1609a5afc4f5

  $ hg up -q 0
  $ mkdir a
  $ echo 3 > a/b
  $ hg up file
  abort: *: '$TESTTMP/repo/a' (glob)
  [255]
  $ hg up --clean file
  abort: *: '$TESTTMP/repo/a' (glob)
  [255]

Basic update - untracked file conflicts with remote directory

  $ hg up -q 0
  $ echo untracked > a
  $ hg up --config merge.checkunknown=warn dir
  abort: *: '$TESTTMP/repo/a/b' (glob)
  [255]

Repo is in a very bad state now - recover manually

  $ rm -f a
  $ hg up -q --clean 0

Basic clean update - local directory conflicts with changed remote file

  $ hg up -q file
  $ rm a

34552:33c8a6837181

  $ hg up -q 0
  $ mkdir a
  $ echo 3 > a/b
  $ hg up file
  a: untracked file differs
  abort: untracked files in working directory differ from files in requested revision
  [255]
  $ hg up --clean file
  abort: *: '$TESTTMP/repo/a' (glob)
  [255]

Basic update - untracked file conflicts with remote directory

  $ hg up -q 0
  $ echo untracked > a
  $ hg up --config merge.checkunknown=warn dir
  a: replacing untracked file
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  (activating bookmark dir)

Basic clean update - local directory conflicts with changed remote file

  $ hg up -q file
  $ rm a