comparison tests/test-update-names.t @ 29629:b33c0c38d68f stable

update: fix bug when update tries to modify folder symlink

In 1e4512eac59e0114bc60ecbcdc4157fc0fa0439d, I introduced a new bug:
when a symlink points to a folder in commit A and to another folder
in commit B, while updating from A to B, Mercurial will try to use
removedir on this symlink, which will fail. This is a very bad bug,
since it basically renders symlinks to folders unusable in repos.

Added test case fails without a fix and passes with it.

29628:6217180f9ab8

  ? name/file
  $ hg up 1
  abort: *: '$TESTTMP/r1/r2/name' (glob)
  [255]
  $ cd ..

29629:b33c0c38d68f

  ? name/file
  $ hg up 1
  abort: *: '$TESTTMP/r1/r2/name' (glob)
  [255]
  $ cd ..

#if symlink

Test update when two commits have symlinks that point to different folders
  $ hg init r3 && cd r3
  $ echo root > root && hg ci -Am root
  adding root
  $ mkdir folder1 && mkdir folder2
  $ ln -s folder1 folder
  $ hg ci -Am "symlink to folder1"
  adding folder
  $ rm folder
  $ ln -s folder2 folder
  $ hg ci -Am "symlink to folder2"
  $ hg up 1
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ cd ..

#endif