Mercurial > hg > gitweb

comparison tests/test-up-local-change.out @ 1933:7544700fd931

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Some systems show "Thu Jan 01" instead of "Thu Jan 1", which breaks tests. Using "1000000" yields "Mon Jan 12 13:46:40 1970", which looks the same on all systems.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 13 Mar 2006 13:05:41 +0100
parents 6d50d6189269
children 2da2d46862fb
comparison
equal deleted inserted replaced
1932:82995896d5af 1933:7544700fd931
1 adding a 1 adding a
2 diff -r c19d34741b0a a 2 diff -r 33aaa84a386b a
3 --- a/a 3 --- a/a
4 +++ b/a 4 +++ b/a
5 @@ -1,1 +1,1 @@ a 5 @@ -1,1 +1,1 @@ a
6 -a 6 -a
7 +abc 7 +abc
8 adding b 8 adding b
9 M a 9 M a
10 changeset: 0:c19d34741b0a 10 changeset: 0:33aaa84a386b
11 user: test 11 user: test
12 date: Thu Jan 1 00:00:00 1970 +0000 12 date: Mon Jan 12 13:46:40 1970 +0000
13 summary: 1 13 summary: 1
14 14
15 resolving manifests 15 resolving manifests
16 force None allow None moddirstate True linear True 16 force None allow None moddirstate True linear True
17 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e 17 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
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 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
25 changeset: 1:1e71731e6fbb 25 changeset: 1:802f095af299
26 tag: tip 26 tag: tip
27 user: test 27 user: test
28 date: Thu Jan 1 00:00:00 1970 +0000 28 date: Mon Jan 12 13:46:40 1970 +0000
29 summary: 2 29 summary: 2
30 30
31 resolving manifests 31 resolving manifests
32 force None allow None moddirstate True linear True 32 force None allow None moddirstate True linear True
33 ancestor a0c8bcbbb45c local 1165e8bd193e remote a0c8bcbbb45c 33 ancestor a0c8bcbbb45c local 1165e8bd193e remote a0c8bcbbb45c
34 remote deleted b 34 remote deleted b
35 removing b 35 removing b
36 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 36 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
37 changeset: 0:c19d34741b0a 37 changeset: 0:33aaa84a386b
38 user: test 38 user: test
39 date: Thu Jan 1 00:00:00 1970 +0000 39 date: Mon Jan 12 13:46:40 1970 +0000
40 summary: 1 40 summary: 1
41 41
42 abort: there is nothing to merge, just use 'hg update' 42 abort: there is nothing to merge, just use 'hg update'
43 failed 43 failed
44 changeset: 0:c19d34741b0a 44 changeset: 0:33aaa84a386b
45 user: test 45 user: test
46 date: Thu Jan 1 00:00:00 1970 +0000 46 date: Mon Jan 12 13:46:40 1970 +0000
47 summary: 1 47 summary: 1
48 48
49 resolving manifests 49 resolving manifests
50 force None allow None moddirstate True linear True 50 force None allow None moddirstate True linear True
51 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e 51 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
54 getting b 54 getting b
55 merging a 55 merging a
56 resolving a 56 resolving a
57 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 58 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
59 changeset: 1:1e71731e6fbb 59 changeset: 1:802f095af299
60 tag: tip 60 tag: tip
61 user: test 61 user: test
62 date: Thu Jan 1 00:00:00 1970 +0000 62 date: Mon Jan 12 13:46:40 1970 +0000
63 summary: 2 63 summary: 2
64 64
65 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 65 changeset: 1:802f095af299cde27a85b2f056aef3829870956c
66 tag: tip 66 tag: tip
67 user: test 67 user: test
68 date: Thu Jan 1 00:00:00 1970 +0000 68 date: Mon Jan 12 13:46:40 1970 +0000
69 files: a b 69 files: a b
70 description: 70 description:
71 2 71 2
72 72
73 73
74 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e 74 changeset: 0:33aaa84a386bd609094aeb21a97c09436c482ef1
75 user: test 75 user: test
76 date: Thu Jan 1 00:00:00 1970 +0000 76 date: Mon Jan 12 13:46:40 1970 +0000
77 files: a 77 files: a
78 description: 78 description:
79 1 79 1
80 80
81 81
82 diff -r 1e71731e6fbb a 82 diff -r 802f095af299 a
83 --- a/a 83 --- a/a
84 +++ b/a 84 +++ b/a
85 @@ -1,1 +1,1 @@ a2 85 @@ -1,1 +1,1 @@ a2
86 -a2 86 -a2
87 +abc 87 +abc
88 adding b 88 adding b
89 M a 89 M a
90 changeset: 1:1e71731e6fbb 90 changeset: 1:802f095af299
91 user: test 91 user: test
92 date: Thu Jan 1 00:00:00 1970 +0000 92 date: Mon Jan 12 13:46:40 1970 +0000
93 summary: 2 93 summary: 2
94 94
95 resolving manifests 95 resolving manifests
96 force None allow None moddirstate True linear False 96 force None allow None moddirstate True linear False
97 ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392 97 ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392
116 merging b 116 merging b
117 resolving b 117 resolving b
118 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 119 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
120 (branch merge, don't forget to commit) 120 (branch merge, don't forget to commit)
121 changeset: 1:1e71731e6fbb 121 changeset: 1:802f095af299
122 user: test 122 user: test
123 date: Thu Jan 1 00:00:00 1970 +0000 123 date: Mon Jan 12 13:46:40 1970 +0000
124 summary: 2 124 summary: 2
125 125
126 changeset: 2:83c51d0caff4 126 changeset: 2:030602aee63d
127 tag: tip 127 tag: tip
128 parent: 0:c19d34741b0a 128 parent: 0:33aaa84a386b
129 user: test 129 user: test
130 date: Thu Jan 1 00:00:00 1970 +0000 130 date: Mon Jan 12 13:46:40 1970 +0000
131 summary: 3 131 summary: 3
132 132
133 diff -r 1e71731e6fbb a 133 diff -r 802f095af299 a
134 --- a/a 134 --- a/a
135 +++ b/a 135 +++ b/a
136 @@ -1,1 +1,1 @@ a2 136 @@ -1,1 +1,1 @@ a2
137 -a2 137 -a2
138 +abc 138 +abc