[issue2173] merge breaks when symlinked file is modified in branch

Justin Lebar bugs at mercurial.selenic.com
Fri May 7 17:17:26 UTC 2010


New submission from Justin Lebar <justin.lebar at gmail.com>:

$ hg --version
Mercurial Distributed SCM (version 1.5.2)

STR:

$ hg init
$ echo 'first file' > file1
$ echo 'second file' > file2
$ hg add file1 file2
$ hg ci -m 'initial commit'

$ ln -sf file1 file2
$ hg ci -m 'symlinking file2'

$ hg up --rev 0
$ echo 'modified second file' > file2
$ hg ci -m 'modifying file2'

$ hg merge
merging file2
abort: No such file or directory: /home/jlebar/file2

Actual results:
$ ls -l
file1
file2 -> modified second file?
file2.orig -> modified second file?

i.e. hg tries to merge the modified contents of file2 into the link target
itself.

Expected results:
A more intelligent merge between the symlink and the regular file.

----------
messages: 12449
nosy: jlebar
priority: bug
status: unread
title: merge breaks when symlinked file is modified in branch
topic: merge

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue2173>
____________________________________________________


More information about the Mercurial-devel mailing list