Mercurial > hg
view tests/test-up-local-change @ 4195:e8ee8fdeddb1
change locate to use relglobs by default
This makes its default behaviour useful again (issue108), and
changes it search the entire repository by default (instead
of just the cwd), just like all other commands.
It also hides issue204 by default, but you'll still see the
same behaviour if you give it a relpath: pattern.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Sat, 10 Mar 2007 23:00:57 -0300 |
parents | 096f1c73cdc3 |
children | 46280c004f22 |
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 "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