Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge3.out @ 558:0ceea19182a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
transaction: __del__ should do nothing if the journal already exists -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 transaction: __del__ should do nothing if the journal already exists manifest hash: c85f747ca762b7c446d306cbd7a20f8e566557fb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxXbTywK+sNU5EO8RAvjsAKCcTSzN9OjtoAdaZgtjDs9380ia7ACfcXsx FcNESqr4nX9b97WTGszJs48= =C2sL -----END PGP SIGNATURE-----
author mpm@selenic.com
date Fri, 01 Jul 2005 09:01:07 -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!