Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-up-local-change @ 1656:14d73fff4c45
convert-repo: use commit rather than rawcommit
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 29 Jan 2006 18:38:56 +1300 |
parents | db10b7114de0 |
children | dee55c4a4963 |
line wrap: on
line source
#!/bin/sh set -e mkdir r1 cd r1 hg init echo a > a hg addremove hg commit -m "1" -d "0 0" hg clone . ../r2 cd ../r2 hg up echo abc > a hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" cd ../r1 echo b > b echo a2 > a hg addremove hg commit -m "2" -d "0 0" cd ../r2 hg -q pull ../r1 hg status hg --debug up hg --debug up -m || echo failed hg --debug up -f -m hg parents hg -v history hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"