Mercurial > hg
view tests/test-up-local-change @ 496:6ce95a04999d
[PATCH] simplify init
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] simplify init
From: Bryan O'Sullivan <bos@serpentine.com>
Remove source directory option from "hg init".
manifest hash: 2ace7b16c962fb434340b937fbcd494f3098a85f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCwQG/ywK+sNU5EO8RArbCAJ9DG45GepMI0Z9KWXqV8gmEbV1WfwCgotih
LGAkD8iTfOLn7HIPVqt9FWY=
=65uW
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Mon, 27 Jun 2005 23:52:31 -0800 |
parents | c5705ab9cebd |
children | 3d4d5f2aba9a 4fc63e22b1fe |
line wrap: on
line source
#!/bin/bash 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 -d up hg -d up -m hg parents hg -v history hg diff > ../d sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d