Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge2 @ 709:cc2e8f3d4412
Fix synopsis: hg forget needs at least one file name.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix synopsis: hg forget needs at least one file name.
manifest hash: 1386189a11f9bc539ae2c4bf93333235931d8bc6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC14i7W7P1GVgWeRoRAj3OAKCBPkYzoxOHu0Xp/vZ6Myz6JGM4hACgimU+
Gw1Av4ESM2ivORd8ulHMdBc=
=kDiv
-----END PGP SIGNATURE-----
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 15 Jul 2005 10:58:19 +0100 |
parents | feadc9697b43 |
children | 7e4843b7efd2 |
line wrap: on
line source
#!/bin/sh -x mkdir t cd t hg init echo This is file a1 > a hg add a hg commit -t "commit #0" -d "0 0" -u user echo This is file b1 > b hg add b hg commit -t "commit #1" -d "0 0" -u user rm b hg update 0 echo This is file b2 > b hg add b hg commit -t "commit #2" -d "0 0" -u user cd ..; /bin/rm -rf t mkdir t cd t hg init echo This is file a1 > a hg add a hg commit -t "commit #0" -d "0 0" -u user echo This is file b1 > b hg add b hg commit -t "commit #1" -d "0 0" -u user rm b hg update 0 echo This is file b2 > b hg commit -A -t "commit #2" -d "0 0" -u user cd ..; /bin/rm -rf t mkdir t cd t hg init echo This is file a1 > a hg add a hg commit -t "commit #0" -d "0 0" -u user echo This is file b1 > b hg add b hg commit -t "commit #1" -d "0 0" -u user rm b hg remove b hg update 0 echo This is file b2 > b hg commit -A -t "commit #2" -d "0 0" -u user cd ..; /bin/rm -rf t