Mercurial > hg

view tests/test-update-renames @ 10945:90f72f47cfc2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 19 Apr 2010 21:47:23 +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 ..