Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-up-local-change.out @ 388:398737777644

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed tests for displaying tags in hg history and hg parents. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fixed tests for displaying tags in hg history and hg parents. manifest hash: 1ff138f68590e11a20e1f375c0c7293bdfb9f1fb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCsp/XW7P1GVgWeRoRAtS1AJ90tbAlt89jZr//nYMEgoVv2UL6GwCgih7L yFwVR4cWpSGyrl0zvYM3AiU= =6OjG -----END PGP SIGNATURE-----
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 17 Jun 2005 11:03:03 +0100
parents 37249c522770
children 8f8bb77d560e
comparison
equal deleted inserted replaced
387:c07c6fb2f0a8 388:398737777644
38 + hg -d up -m 38 + hg -d up -m
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 tag: tip
43 user: test 44 user: test
44 date: Thu Jan 1 00:00:00 1970 45 date: Thu Jan 1 00:00:00 1970
45 summary: 2 46 summary: 2
46 47
47 + hg -v history 48 + hg -v history
48 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 49 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
50 tag: tip
49 manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758 51 manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758
50 user: test 52 user: test
51 date: Thu Jan 1 00:00:00 1970 53 date: Thu Jan 1 00:00:00 1970
52 files: a b 54 files: a b
53 description: 55 description: