view tests/test-issue1438 @ 9750:f153af9580fe

merge: first part of fix for issue1327 When there are no renames involved, we shortcut to the changeset ancestor. This resolves most cases. Note that Mercurial's rename philosophy elsewhere is that a file's name is signficant and rename data is only consulted when a file of the same name is absent.
author Matt Mackall <mpm@selenic.com>
date Sat, 07 Nov 2009 14:07:45 -0600
parents 2c5b2abfb8be
children
line wrap: on
line source

#!/bin/sh
"$TESTDIR/hghave" symlink || exit 80

rm -rf a
hg init a
cd a

ln -s foo link
hg add link
hg ci -mbad link
hg rm link
hg ci -mok
hg diff -g -r 0:1 > bad.patch
hg up 0
hg import --no-commit bad.patch
hg st