Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-up-local-change.out @ 748:c5df1a9c5276

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update test output for status change manifest hash: da9effa63afe6ec22389e17f7fc2daeb3bb4f0e0
author mpm@selenic.com
date Thu, 21 Jul 2005 12:40:28 -0500
parents 574869103985
children 7e4843b7efd2
comparison
equal deleted inserted replaced
747:c3ce3976ae75 748:c5df1a9c5276
22 + hg addremove 22 + hg addremove
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 M a
28 + hg --debug up 28 + hg --debug up
29 resolving manifests 29 resolving manifests
30 force None allow None moddirstate True linear True 30 force None allow None moddirstate True linear True
31 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e 31 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
32 a versions differ, resolve 32 a versions differ, resolve