Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-up-local-change.out @ 382:37249c522770

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test suite: fix timezone problems and port collision problem -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 test suite: fix timezone problems and port collision problem manifest hash: 44652133f49c24679b289c0250eb591682225c54 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsaq7ywK+sNU5EO8RAluQAKCSuUGge7bQPbWbQoIfWETDFRibNwCgs12e /TSLCPJ0aHvqttMhJSaYOSU= =5OYO -----END PGP SIGNATURE-----
author mpm@selenic.com
date Thu, 16 Jun 2005 08:37:15 -0800
parents e5d769afd3ef
children 398737777644
comparison
equal deleted inserted replaced
381:024ee0f8722a 382:37249c522770
39 resolving manifests 39 resolving manifests
40 ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e 40 ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
41 + hg parents 41 + hg parents
42 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 42 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
43 user: test 43 user: test
44 date: Wed Dec 31 16:00:00 1969 44 date: Thu Jan 1 00:00:00 1970
45 summary: 2 45 summary: 2
46 46
47 + hg -v history 47 + hg -v history
48 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 48 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
49 manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758 49 manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758
50 user: test 50 user: test
51 date: Wed Dec 31 16:00:00 1969 51 date: Thu Jan 1 00:00:00 1970
52 files: a b 52 files: a b
53 description: 53 description:
54 2 54 2
55 55
56 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e 56 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
57 manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 57 manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
58 user: test 58 user: test
59 date: Wed Dec 31 16:00:00 1969 59 date: Thu Jan 1 00:00:00 1970
60 files: a 60 files: a
61 description: 61 description:
62 1 62 1
63 63
64 + hg diff 64 + hg diff