[Python-apps-team] Bug#595679: mercurial: mq incorrectly applies patches that moves a symlink and edit its target

[Jakub Wilk]

Package: mercurial
Version: 1.6.2-2
Severity: normal

$ hg init
$ ln -s foo foo
$ hg add foo
$ hg ci -m .
$ hg mv foo bar/bar
$ ln -sf bar bar/bar
$ hg ci -m .
$ ls -l bar/bar                   
lrwxrwxrwx 1 jwilk users 3 Sep  5 19:03 bar/bar -> bar
$ printf '[diff]\ngit=true\n' > .hg/hgrc
$ hg qimport -r tip
$ hg qpop
popping 1.diff
patch queue now empty
$ hg qpush
applying 1.diff
now at: 1.diff
$ ls -l bar/bar                   
lrwxrwxrwx 1 jwilk users 3 Sep  5 19:05 bar/bar -> foo

(Note that symlink target it "foo", not "bar" as it should.)


-- System Information:
Debian Release: squeeze/sid
   APT prefers unstable
   APT policy: (990, 'unstable'), (500, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.32-5-686 (SMP w/2 CPU cores)
Locale: LANG=C, LC_CTYPE=pl_PL.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages mercurial depends on:
ii  libc6                        2.11.2-4    Embedded GNU C Library: Shared lib
ii  mercurial-common             1.6.2-2     scalable distributed version contr
ii  python                       2.6.6-1     interactive high-level object-orie
ii  python-support               1.0.9       automated rebuilding support for P
ii  ucf                          3.0025+nmu1 Update Configuration File: preserv

-- 
Jakub Wilk
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/python-apps-team/attachments/20100905/b81d5ba1/attachment.pgp>