Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-backwards-remove.out @ 754:3e73bf876f17

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes and cleanups to hgeditor: - "HG: merge resolve" isn't supported for a long time now. - detection of unchanged commit message if signing is turned off. - don't add manifest hash to commit message if not signing.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 22 Jul 2005 07:30:52 +0100
parents 7e4843b7efd2
children 1f9ec150a476 8f5637f0a0c0 0902ffece4b4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
383
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff changeset
1 + hg init
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff changeset
2 + echo This is file a1
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff changeset
3 + hg add a
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 383
diff changeset
4 + hg commit -m 'commit #0' -d '0 0'
383
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff changeset
5 + ls
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff changeset
6 a
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff changeset
7 + echo This is file b1
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff changeset
8 + hg add b
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 383
diff changeset
9 + hg commit -m 'commit #1' -d '0 0'
383
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff changeset
10 + hg co 0
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff changeset
11 + ls
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff changeset
12 a