view tests/test-update-renames @ 12114:0a6b2e21bc86

tests: merge the two test-rename-dir-merge* into one
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Mon, 30 Aug 2010 13:55:57 +0900
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 ..