view tests/test-revlog-group-emptyiter @ 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 aaaf4af1c173
children
line wrap: on
line source

#! /bin/sh

# issue 1678

echo "# -- setting up base repo"
hg init a
cd a
touch a
hg ci -Am a
cd ..

echo "# -- cloning base repo"
hg clone a b
cd b

echo "# -- setting up cset to push"
hg up null
touch a
hg ci -Am b # different msg so we get a clog new entry

echo "# -- pushing"
hg push -f ../a