view tests/test-update-renames @ 11453:2ee26044d846 stable

context: allow passing the common cset ancestor to fctx.ancestor This is used by the next patch to speed up merge.applyupdates.
author Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
date Fri, 18 Jun 2010 08:48:05 +0200
parents 4f11978ae45d
children
line wrap: on
line source

#!/bin/sh

# test update logic when there are renames


# update with local changes across a file rename
hg init a
cd a
echo a > a
hg add a
hg ci -m a
hg mv a b
hg ci -m rename
echo b > b
hg ci -m change
hg up -q 0
echo c > a
hg up
cd ..