Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-up-local-change.out @ 374:f07d00fcd281
update tests to reflect new short hash length
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
update tests to reflect new short hash length
manifest hash: 7ae99e74333416e8cbf8bc5d518bb5d3c449788b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCsQo8ywK+sNU5EO8RAltAAJ97yqgcTU0eYrQ2vpIq+hrfCfrsVwCggUk4
adIvEe7OzGeG6wn0/aRoQXY=
=h8+W
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Wed, 15 Jun 2005 21:12:28 -0800 |
parents | b4e0e20646bb |
children | e5d769afd3ef |
comparison
equal
deleted
inserted
replaced
373:67081329d49a | 374:f07d00fcd281 |
---|---|
26 + hg -q pull ../r1 | 26 + hg -q pull ../r1 |
27 + hg status | 27 + hg status |
28 C a | 28 C a |
29 + hg -d up | 29 + hg -d up |
30 resolving manifests | 30 resolving manifests |
31 ancestor a0c8bcbb local a0c8bcbb remote 1165e8bd | 31 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e |
32 a versions differ, resolve | 32 a versions differ, resolve |
33 remote created b | 33 remote created b |
34 getting b | 34 getting b |
35 merging a | 35 merging a |
36 resolving a | 36 resolving a |
37 file a: other d730145a ancestor b789fdd9 | 37 file a: other d730145abbf9 ancestor b789fdd96dc2 |
38 + hg -d up -m | 38 + hg -d up -m |
39 resolving manifests | 39 resolving manifests |
40 ancestor 1165e8bd local 1165e8bd remote 1165e8bd | 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: Wed Dec 31 16:00:00 1969 |
45 summary: 2 | 45 summary: 2 |