Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-up-local-change.out @ 1922:6d50d6189269

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ui: output the number of file updated/merged/removed/... on update add a note for people to remember commiting after a merge.
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 13 Mar 2006 08:56:59 +0100
parents dee55c4a4963
children 7544700fd931
comparison
equal deleted inserted replaced
1921:acce3f7e1779 1922:6d50d6189269
19 remote created b 19 remote created b
20 getting b 20 getting b
21 merging a 21 merging a
22 resolving a 22 resolving a
23 file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2 23 file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2
24 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
24 changeset: 1:1e71731e6fbb 25 changeset: 1:1e71731e6fbb
25 tag: tip 26 tag: tip
26 user: test 27 user: test
27 date: Thu Jan 1 00:00:00 1970 +0000 28 date: Thu Jan 1 00:00:00 1970 +0000
28 summary: 2 29 summary: 2
30 resolving manifests 31 resolving manifests
31 force None allow None moddirstate True linear True 32 force None allow None moddirstate True linear True
32 ancestor a0c8bcbbb45c local 1165e8bd193e remote a0c8bcbbb45c 33 ancestor a0c8bcbbb45c local 1165e8bd193e remote a0c8bcbbb45c
33 remote deleted b 34 remote deleted b
34 removing b 35 removing b
36 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
35 changeset: 0:c19d34741b0a 37 changeset: 0:c19d34741b0a
36 user: test 38 user: test
37 date: Thu Jan 1 00:00:00 1970 +0000 39 date: Thu Jan 1 00:00:00 1970 +0000
38 summary: 1 40 summary: 1
39 41
51 remote created b 53 remote created b
52 getting b 54 getting b
53 merging a 55 merging a
54 resolving a 56 resolving a
55 file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2 57 file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2
58 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
56 changeset: 1:1e71731e6fbb 59 changeset: 1:1e71731e6fbb
57 tag: tip 60 tag: tip
58 user: test 61 user: test
59 date: Thu Jan 1 00:00:00 1970 +0000 62 date: Thu Jan 1 00:00:00 1970 +0000
60 summary: 2 63 summary: 2
111 resolving a 114 resolving a
112 file a: my d730145abbf9 other 13e0d5f949fa ancestor b789fdd96dc2 115 file a: my d730145abbf9 other 13e0d5f949fa ancestor b789fdd96dc2
113 merging b 116 merging b
114 resolving b 117 resolving b
115 file b: my 1e88685f5dde other 61de8c7723ca ancestor 000000000000 118 file b: my 1e88685f5dde other 61de8c7723ca ancestor 000000000000
119 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
120 (branch merge, don't forget to commit)
116 changeset: 1:1e71731e6fbb 121 changeset: 1:1e71731e6fbb
117 user: test 122 user: test
118 date: Thu Jan 1 00:00:00 1970 +0000 123 date: Thu Jan 1 00:00:00 1970 +0000
119 summary: 2 124 summary: 2
120 125