Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge3 @ 654:fafc16f705b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make cloning by hardlink quiet again -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Make cloning by hardlink quiet again manifest hash: bd12b4deedb99e06415619f858b95b566a6d329e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCzvGGywK+sNU5EO8RAiCzAJ9iCRbyijLT7PqkgCI9eFn+9pl+KQCfdcB1 yHxfvLCL39wAAcBo6Hebpvo= =qne+ -----END PGP SIGNATURE-----
author Matt Mackall <mpm@selenic.com>
date Fri, 08 Jul 2005 13:35:02 -0800
parents 2fe8d66e3075
children 7e4843b7efd2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
402
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
1 #!/bin/sh -x
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
2
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
3 hg init
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
4 echo This is file a1 > a
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
5 hg add a
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
6 hg commit -t "commit #0" -d "0 0" -u user
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
7 touch b
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
8 hg add b
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
9 rm b
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
10 hg commit -A -t"comment #1" -d "0 0" -u user