Mercurial > hg > pyhgsh
view tests/test-up-local-change @ 676:32f7dc81c07e
Remove references to 'cloning by hardlink' from tests.
# HG changeset patch
# User Andrew Thompson <andrewkt@aktzero.com>
# Node ID c12a49438454e9782ff7eb9b11841e7b9406fbab
# Parent b3bba126b04ab2f24274a1bcf5a224c6317c8e0d
Remove references to 'cloning by hardlink' from tests.
author | Andrew Thompson <andrewkt@aktzero.com> |
---|---|
date | Sun, 10 Jul 2005 16:17:05 -0800 |
parents | eb46971fc57f |
children | 7e4843b7efd2 |
line wrap: on
line source
#!/bin/sh export HGMERGE=true set -ex mkdir r1 cd r1 hg init echo a > a hg addremove hg commit -t "1" -u test -d "0 0" hg clone . ../r2 cd ../r2 hg up echo abc > a hg diff > ../d sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d cd ../r1 echo b > b echo a2 > a hg addremove hg commit -t "2" -u test -d "0 0" cd ../r2 hg -q pull ../r1 hg status hg --debug up hg --debug up -m hg parents hg -v history hg diff > ../d sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d