Mercurial > hg
view tests/test-up-local-change @ 9784:54d292da1df7
hgrc.5: do not mention "name: value" syntax
This was supported in versions prior to 1.3 where we used the standard
Python ConfigParser. The new config parser never supported it.
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sat, 07 Nov 2009 18:47:04 +0100 |
parents | 7a7d4937272b |
children |
line wrap: on
line source
#!/bin/sh HGMERGE=true; export HGMERGE set -e mkdir r1 cd r1 hg init echo a > a hg addremove hg commit -m "1" -d "1000000 0" hg clone . ../r2 cd ../r2 hg up echo abc > a hg diff --nodates cd ../r1 echo b > b echo a2 > a hg addremove hg commit -m "2" -d "1000000 0" cd ../r2 hg -q pull ../r1 hg status hg parents hg --debug up hg parents hg --debug up 0 hg parents hg --debug merge || echo failed hg parents hg --debug up hg parents hg -v history hg diff --nodates # create a second head cd ../r1 hg up 0 echo b2 > b echo a3 > a hg addremove hg commit -m "3" -d "1000000 0" cd ../r2 hg -q pull ../r1 hg status hg parents hg --debug up || echo failed hg --debug merge || echo failed hg --debug merge -f hg parents hg diff --nodates # test a local add cd .. hg init a hg init b echo a > a/a echo a > b/a hg --cwd a commit -A -m a cd b hg add a hg pull -u ../a hg st