Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-up-local-change.out @ 591:eb46971fc57f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
options: kill -d for debug -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 options: kill -d for debug You must now use --debug. This is a preparatory step for changing the option parsing from: hg [global-opts] <command> [command-opts] to hg [global-opts] <command> [global or command opts] manifest hash: ec5ecc687340baa109a98b742f1cd8d1f4aadeed -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCx4urywK+sNU5EO8RAl90AJ0fwKU/GwHpJvlTFl5naeJbkceWewCgh4jK kaTSSodACgPzgbFiid5RL4Y= =siEe -----END PGP SIGNATURE-----
author mpm@selenic.com
date Sat, 02 Jul 2005 22:54:35 -0800
parents 4fc63e22b1fe
children d96c1153b25d
comparison
equal deleted inserted replaced
590:38d106db75bc 591:eb46971fc57f
23 + hg commit -t 2 -u test -d '0 0' 23 + hg commit -t 2 -u test -d '0 0'
24 + cd ../r2 24 + cd ../r2
25 + hg -q pull ../r1 25 + hg -q pull ../r1
26 + hg status 26 + hg status
27 C a 27 C a
28 + hg -d up 28 + hg --debug up
29 resolving manifests 29 resolving manifests
30 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e 30 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
31 a versions differ, resolve 31 a versions differ, resolve
32 remote created b 32 remote created b
33 getting b 33 getting b
34 merging a 34 merging a
35 resolving a 35 resolving a
36 file a: other d730145abbf9 ancestor b789fdd96dc2 36 file a: other d730145abbf9 ancestor b789fdd96dc2
37 + hg -d up -m 37 + hg --debug up -m
38 resolving manifests 38 resolving manifests
39 ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e 39 ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
40 + hg parents 40 + hg parents
41 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 41 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
42 tag: tip 42 tag: tip