Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-up-local-change @ 673:8e518e11f6cf
Change MANIFEST.in to recursive-include the contrib/ folder.
# HG changeset patch
# User Andrew Thompson <andrewkt@aktzero.com>
# Node ID e5dc09266c217bc50b91d710a045c679411e4727
# Parent c55df1c38618035c8e94e7af025e2b7f38f6d743
Change MANIFEST.in to recursive-include the contrib/ folder.
Now sdist picks up git-viz again.
author | Andrew Thompson <andrewkt@aktzero.com> |
---|---|
date | Sun, 10 Jul 2005 16:14:41 -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