comparison tests/test-audit-path.t @ 34942:2a774cae3a03 stable

merge: disable path conflict checking by default (issue5716)

We shouldn't ship a severe perf regression in hg update for 4.4.

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

34941:37450a122128

  $ hg manifest -r2
  back
  back/test
#if symlink
  $ hg update -Cr2
  back: is both a file and a directory
  abort: destination manifest contains path conflicts
  [255]
#else
('back' will be a file and cause some other system specific error)
  $ hg update -Cr2
  back: is both a file and a directory

try trivial merge

  $ hg up -qC 1
  $ hg merge 2
  a: path conflict - a file or link has the same name as a directory
  the local file has been renamed to a~aa04623eb0c3
  resolve manually then use 'hg resolve --mark a'
  1 files updated, 0 files merged, 0 files removed, 1 files unresolved
  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
  [1]

try rebase onto other revision: cache of audited paths should be discarded,
and the rebase should fail (issue5628)

  $ hg up -qC 2
  $ hg rebase -s 2 -d 1 --config extensions.rebase=
  rebasing 2:e73c21d6b244 "file a/poisoned" (tip)
  a: path conflict - a file or link has the same name as a directory
  the local file has been renamed to a~aa04623eb0c3
  resolve manually then use 'hg resolve --mark a'
  unresolved conflicts (see hg resolve, then hg rebase --continue)
  [1]
  $ ls ../merge-symlink-out

  $ cd ..

Test symlink traversal on update:

try linear update where symlink already exists:

  $ hg up -qC 0
  $ hg up 1
  a: is both a file and a directory
  abort: destination manifest contains path conflicts
  [255]

try linear update including symlinked directory and its content: paths are
audited first by calculateupdates(), where no symlink is created so both
'a' and 'a/b' are taken as good paths. still applyupdates() should fail.

  $ hg up -qC null
  $ hg up 1
  a: is both a file and a directory
  abort: destination manifest contains path conflicts
  [255]
  $ ls ../update-symlink-out

try branch update replacing directory with symlink, and its content: the
path 'a' is audited as a directory first, which should be audited again as
a symlink.

  $ rm -f a
  $ hg up -qC 2
  $ hg up 1
  a: is both a file and a directory
  abort: destination manifest contains path conflicts
  [255]
  $ ls ../update-symlink-out

  $ cd ..

34942:2a774cae3a03

  $ hg manifest -r2
  back
  back/test
#if symlink
  $ hg update -Cr2
  abort: path 'back/test' traverses symbolic link 'back'
  [255]
#else
('back' will be a file and cause some other system specific error)
  $ hg update -Cr2
  back: is both a file and a directory

try trivial merge

  $ hg up -qC 1
  $ hg merge 2
  abort: path 'a/poisoned' traverses symbolic link 'a'
  [255]

try rebase onto other revision: cache of audited paths should be discarded,
and the rebase should fail (issue5628)

  $ hg up -qC 2
  $ hg rebase -s 2 -d 1 --config extensions.rebase=
  rebasing 2:e73c21d6b244 "file a/poisoned" (tip)
  abort: path 'a/poisoned' traverses symbolic link 'a'
  [255]
  $ ls ../merge-symlink-out

  $ cd ..

Test symlink traversal on update:

try linear update where symlink already exists:

  $ hg up -qC 0
  $ hg up 1
  abort: path 'a/b' traverses symbolic link 'a'
  [255]

try linear update including symlinked directory and its content: paths are
audited first by calculateupdates(), where no symlink is created so both
'a' and 'a/b' are taken as good paths. still applyupdates() should fail.

  $ hg up -qC null
  $ hg up 1
  abort: path 'a/b' traverses symbolic link 'a'
  [255]
  $ ls ../update-symlink-out

try branch update replacing directory with symlink, and its content: the
path 'a' is audited as a directory first, which should be audited again as
a symlink.

  $ rm -f a
  $ hg up -qC 2
  $ hg up 1
  abort: path 'a/b' traverses symbolic link 'a'
  [255]
  $ ls ../update-symlink-out

  $ cd ..