Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge2.out @ 465:f8cb8d082d40
Add a doc makefile
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Add a doc makefile
- From Vincent Danjean
manifest hash: ef14a37f8bdee641148e705ba13ce386cf29316a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCvQSmywK+sNU5EO8RAh/QAJoCDQVUKS8uYO5kcIqJBsrKYtj+FACgmSvI
FnYSmWjUX5kLbDHdQqM6jls=
=fPAM
-----END PGP SIGNATURE-----
| author | mpm@selenic.com |
|---|---|
| date | Fri, 24 Jun 2005 23:15:50 -0800 |
| parents | feadc9697b43 |
| children | 7e4843b7efd2 |
line wrap: on
line source
+ mkdir t + cd t + hg init + echo This is file a1 + hg add a + hg commit -t 'commit #0' -d '0 0' -u user + echo This is file b1 + hg add b + hg commit -t 'commit #1' -d '0 0' -u user + rm b + hg update 0 + echo This is file b2 + 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 + hg add a + hg commit -t 'commit #0' -d '0 0' -u user + echo This is file b1 + hg add b + hg commit -t 'commit #1' -d '0 0' -u user + rm b + hg update 0 + echo This is file b2 + 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 + hg add a + hg commit -t 'commit #0' -d '0 0' -u user + echo This is file b1 + 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 + hg commit -A -t 'commit #2' -d '0 0' -u user + cd .. + /bin/rm -rf t