Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-up-local-change.out @ 784:853bfbf1a312
Fix tests for short changeset hashes and hidden manifest hashes
author | mpm@selenic.com |
---|---|
date | Wed, 27 Jul 2005 10:21:19 -0800 |
parents | 122449dd89db |
children | 445970ccf57a 8f5637f0a0c0 0902ffece4b4 |
line wrap: on
line diff
--- a/tests/test-up-local-change.out +++ b/tests/test-up-local-change.out @@ -42,7 +42,7 @@ resolving manifests force None allow 1 moddirstate True linear True ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e + hg parents -changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 +changeset: 1:1e71731e6fbb tag: tip user: test date: Thu Jan 1 00:00:00 1970 @@ -51,7 +51,6 @@ summary: 2 + hg -v history changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 tag: tip -manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758 user: test date: Thu Jan 1 00:00:00 1970 files: a b @@ -60,7 +59,6 @@ 2 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e -manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 user: test date: Thu Jan 1 00:00:00 1970 files: a