Mercurial > hg-allpaths
comparison tests/facing_problems.t @ 44:2d6c7e0c1b2f
Added newline between successive items output
author | Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl> |
---|---|
date | Sun, 25 Sep 2016 08:38:27 +0200 |
parents | a1fb32ff4532 |
children | 14a3ffbba22b |
comparison
equal
deleted
inserted
replaced
43:a1fb32ff4532 | 44:2d6c7e0c1b2f |
---|---|
62 searching for changes | 62 searching for changes |
63 adding changesets | 63 adding changesets |
64 adding manifests | 64 adding manifests |
65 adding file changes | 65 adding file changes |
66 added 1 changesets with 1 changes to 1 files | 66 added 1 changesets with 1 changes to 1 files |
67 | |
67 pushing to */unrelated (glob) | 68 pushing to */unrelated (glob) |
68 searching for changes | 69 searching for changes |
69 abort: repository is unrelated | 70 abort: repository is unrelated |
70 [255] | 71 [255] |
71 | 72 |
72 $ hg --cwd $GOOD1 log -T '{rev}: {desc}\n' | 73 $ hg --cwd $GOOD1 log -T '{rev}: {desc}\n' |
73 0: First | 74 0: First |
74 | 75 |
75 $ hg --cwd $GOOD2 log -T '{rev}: {desc}\n' | 76 $ hg --cwd $GOOD2 log -T '{rev}: {desc}\n' |
77 | |
78 $ hg --cwd $UNREL log -T '{rev}: {desc}\n' | |
79 0: Unrelated | |
80 | |
81 and again, but in non-breaking mode | |
82 | |
83 $ cat >> $BASE/file.txt << EOF | |
84 > More text | |
85 > EOF | |
86 $ hg --cwd $BASE commit -m 'Second' | |
87 | |
88 $ hg --cwd $BASE pushall --ignore-errors | |
89 pushing to */good1 (glob) | |
90 searching for changes | |
91 adding changesets | |
92 adding manifests | |
93 adding file changes | |
94 added 1 changesets with 1 changes to 1 files | |
95 | |
96 pushing to */unrelated (glob) | |
97 searching for changes | |
98 error handling unrel: repository is unrelated | |
99 | |
100 error handling missing: repository */missing does not exist (glob) | |
101 | |
102 pushing to */good2 (glob) | |
103 searching for changes | |
104 adding changesets | |
105 adding manifests | |
106 adding file changes | |
107 added 2 changesets with 2 changes to 1 files | |
108 | |
109 $ hg --cwd $GOOD1 log -T '{rev}: {desc}\n' | |
110 1: Second | |
111 0: First | |
112 | |
113 $ hg --cwd $GOOD2 log -T '{rev}: {desc}\n' | |
114 1: Second | |
76 0: First | 115 0: First |
77 | 116 |
78 $ hg --cwd $UNREL log -T '{rev}: {desc}\n' | 117 $ hg --cwd $UNREL log -T '{rev}: {desc}\n' |
79 0: Unrelated | 118 0: Unrelated |
80 | 119 |
88 $ hg --cwd $GOOD1 add | 127 $ hg --cwd $GOOD1 add |
89 adding rep1.txt | 128 adding rep1.txt |
90 $ hg --cwd $GOOD1 commit -m "In repo1" | 129 $ hg --cwd $GOOD1 commit -m "In repo1" |
91 | 130 |
92 $ hg --cwd $UNREL update | 131 $ hg --cwd $UNREL update |
93 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 132 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
94 $ cat > $UNREL/unr.txt << EOF | 133 $ cat > $UNREL/unr.txt << EOF |
95 > Another text | 134 > Another text |
96 > EOF | 135 > EOF |
97 $ hg --cwd $UNREL add | 136 $ hg --cwd $UNREL add |
98 adding unr.txt | 137 adding unr.txt |
106 $ hg --cwd $GOOD2 add | 145 $ hg --cwd $GOOD2 add |
107 adding rep1.txt | 146 adding rep1.txt |
108 $ hg --cwd $GOOD2 commit -m "In good2" | 147 $ hg --cwd $GOOD2 commit -m "In good2" |
109 | 148 |
110 $ hg --cwd $BASE incomingall | 149 $ hg --cwd $BASE incomingall |
111 comparing with */rep1 (glob) | 150 comparing with */good1 (glob) |
112 searching for changes | 151 searching for changes |
113 changeset: 1:* (glob) | 152 changeset: 2:* (glob) |
114 tag: tip | 153 tag: tip |
115 user: Andy Default <default@nowhere.net> | 154 user: Andy Default <default@nowhere.net> |
116 date: .* (re) | 155 date: .* (re) |
117 summary: In repo1 | 156 summary: In repo1 |
118 | 157 |
119 comparing with */rep2 (glob) | 158 comparing with */unrelated (glob) |
120 searching for changes | 159 searching for changes |
121 changeset: 1:* (glob) | 160 abort: repository is unrelated |
161 [255] | |
162 | |
163 $ hg --cwd $BASE incomingall --ignore-errors | |
164 comparing with */good1 (glob) | |
165 searching for changes | |
166 changeset: 2:* (glob) | |
122 tag: tip | 167 tag: tip |
123 user: Andy Default <default@nowhere.net> | 168 user: Andy Default <default@nowhere.net> |
124 date: .* (re) | 169 date: .* (re) |
125 summary: In repo2 | 170 summary: In repo1 |
171 | |
172 comparing with */unrelated (glob) | |
173 searching for changes | |
174 error handling unrel: repository is unrelated | |
175 | |
176 error handling missing: repository */missing not found (glob) | |
177 | |
178 comparing with */good2 (glob) | |
179 searching for changes | |
180 changeset: 2:* (glob) | |
181 tag: tip | |
182 user: Andy Default <default@nowhere.net> | |
183 date: .* (re) | |
184 summary: In good2 | |
185 | |
126 | 186 |
127 $ hg --cwd $BASE pullall | 187 $ hg --cwd $BASE pullall |
188 pulling from */good1 (glob) | |
189 searching for changes | |
190 adding changesets | |
191 adding manifests | |
192 adding file changes | |
193 added 1 changesets with 1 changes to 1 files | |
194 (run 'hg update' to get a working copy) | |
195 | |
196 pulling from */unrelated (glob) | |
197 searching for changes | |
198 abort: repository is unrelated | |
199 [255] | |
128 | 200 |
129 $ hg --cwd $BASE log -T '{rev}: {desc}\n' | 201 $ hg --cwd $BASE log -T '{rev}: {desc}\n' |
202 2: In repo1 | |
203 1: Second | |
204 0: First | |
205 | |
206 $ hg --cwd $BASE pullall --ignore-errors | |
207 pulling from */good1 (glob) | |
208 searching for changes | |
209 no changes found | |
210 | |
211 pulling from */unrelated (glob) | |
212 searching for changes | |
213 error handling unrel: repository is unrelated | |
214 | |
215 pulling from */missing (glob) | |
216 error handling missing: repository */missing not found (glob) | |
217 | |
218 pulling from */good2 (glob) | |
219 searching for changes | |
220 adding changesets | |
221 adding manifests | |
222 adding file changes | |
223 added 1 changesets with 0 changes to 1 files (+1 heads) | |
224 (run 'hg heads' to see heads, 'hg merge' to merge) | |
225 | |
226 $ hg --cwd $BASE log -T '{rev}: {desc}\n' | |
227 3: In good2 | |
228 2: In repo1 | |
229 1: Second | |
230 0: First | |
231 |