[issue3400] abort on trying to update or merge across changeset that replaces directory with symlink

[Dov Feldstern]

New submission from Dov Feldstern <dovdevel at gmail.com>:

If a given path which used to be a real directory (or file?) is replaced, in
some changeset, with a symlink, then trying to update or merge across that
changeset causes an error (abort: untracked files in working directory
differ from files in requested revision).

This is a regression, bisection shows the problem starting at:

changeset:   7e30f5f2285f
user:        Matt Mackall <mpm at selenic.com>
date:        Thu Feb 09 16:50:19 2012 -0600
summary:     merge: refactor unknown file conflict checking

Attached a test which passes prior to the above changeset, but fails since.

----------
files: test-symlink-replace-dir.t
messages: 19754
nosy: dov
priority: bug
status: unread
title: abort on trying to update or merge across changeset that replaces directory with symlink
topic: regression, symlinks

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue3400>
____________________________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: test-symlink-replace-dir.t
Type: text/troff
Size: 1940 bytes
Desc: not available
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20120425/207d8e6b/attachment.bin>