Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge3.out @ 564:ced5f5ceb172

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[PATCH] Add contrib/buildrpm script -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Add contrib/buildrpm script From: Bryan O'Sullivan <bos@serpentine.com> Just run "buildrpm", and it builds an RPM for you. No funky monkey business required. manifest hash: b8fde5108b5cc8f49ce248d14ac2ee7ad004c91c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxb6sywK+sNU5EO8RApQZAJ94VD6NQr9l4Xx6w3S8EdpCIUuiIACfdoHA qnQWtMM+kqAzi3LnO92UYWE= =SWIO -----END PGP SIGNATURE-----
author mpm@selenic.com
date Fri, 01 Jul 2005 14:07:40 -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 + hg init
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
2 + echo This is file a1
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
3 + hg add a
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
4 + hg commit -t 'commit #0' -d '0 0' -u user
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
5 + touch b
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
6 + hg add b
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
7 + rm b
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
8 + hg commit -A '-tcomment #1' -d '0 0' -u user
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
9 b never committed!