Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-up-local-change.out @ 677:204328d345f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix up test for update flags
author Matt Mackall <mpm@selenic.com>
date Sun, 10 Jul 2005 16:19:36 -0800
parents 32f7dc81c07e
children b266e92bcd0b 574869103985
comparison
equal deleted inserted replaced
676:32f7dc81c07e 677:204328d345f1
25 + hg -q pull ../r1 25 + hg -q pull ../r1
26 + hg status 26 + hg status
27 C a 27 C 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 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e 31 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
31 a versions differ, resolve 32 a versions differ, resolve
32 remote created b 33 remote created b
33 getting b 34 getting b
34 merging a 35 merging a
35 resolving a 36 resolving a
36 file a: other d730145abbf9 ancestor b789fdd96dc2 37 file a: other d730145abbf9 ancestor b789fdd96dc2
37 + hg --debug up -m 38 + hg --debug up -m
38 resolving manifests 39 resolving manifests
40 force None allow 1 moddirstate True linear True
39 ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e 41 ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
40 + hg parents 42 + hg parents
41 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 43 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
42 tag: tip 44 tag: tip
43 user: test 45 user: test