view tests/test-update-renames @ 11681:c5e555e064d0

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Sun, 25 Jul 2010 21:20:05 -0500
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 ..