Mercurial > hg
annotate tests/test-push-warn.t @ 20444:1478a9ce6790
run-tests: fix typo and print out failing line
Instead of stripping the newline and printing the line, only the newline was
printed.
The output on buildbot will make more sense now.
author | Simon Heimberg <simohe@besonet.ch> |
---|---|
date | Tue, 11 Feb 2014 01:15:07 +0100 |
parents | aa9385f983fa |
children | 8a9e0b523d2d |
rev | line source |
---|---|
13956
ffb5c09ba822
tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents:
13550
diff
changeset
|
1 $ hg init a |
12279 | 2 $ cd a |
3 $ echo foo > t1 | |
4 $ hg add t1 | |
5 $ hg commit -m "1" | |
10875
a9702c47a19f
partial backout of 1e819576e926 and add tests (issue2131)
Sune Foldager <cryo@cyanite.org>
parents:
10771
diff
changeset
|
6 |
12279 | 7 $ cd .. |
8 $ hg clone a b | |
9 updating to branch default | |
10 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
11 | |
12 $ cd a | |
13 $ echo foo > t2 | |
14 $ hg add t2 | |
15 $ hg commit -m "2" | |
16 | |
17 $ cd ../b | |
18 $ echo foo > t3 | |
19 $ hg add t3 | |
20 $ hg commit -m "3" | |
816
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff
changeset
|
21 |
12279 | 22 $ hg push ../a |
23 pushing to ../a | |
24 searching for changes | |
14525
826a13720fbc
prepush: print short hash of first new head in abort message
Adrian Buehlmann <adrian@cadifra.com>
parents:
14164
diff
changeset
|
25 abort: push creates new remote head 1e108cc5548c! |
19934
bfc6ed892349
push: hide description about "-f" in the hint to prevent from using it easily
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19840
diff
changeset
|
26 (pull and merge or see "hg help push" for details about pushing new heads) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12279
diff
changeset
|
27 [255] |
816
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff
changeset
|
28 |
12998
91cb08a9e7fb
discovery: list new remote heads in prepush() on --debug
Adrian Buehlmann <adrian@cadifra.com>
parents:
12785
diff
changeset
|
29 $ hg push --debug ../a |
91cb08a9e7fb
discovery: list new remote heads in prepush() on --debug
Adrian Buehlmann <adrian@cadifra.com>
parents:
12785
diff
changeset
|
30 pushing to ../a |
14164
cb98fed52495
discovery: add new set-based discovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14073
diff
changeset
|
31 query 1; heads |
12998
91cb08a9e7fb
discovery: list new remote heads in prepush() on --debug
Adrian Buehlmann <adrian@cadifra.com>
parents:
12785
diff
changeset
|
32 searching for changes |
14164
cb98fed52495
discovery: add new set-based discovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14073
diff
changeset
|
33 taking quick initial sample |
cb98fed52495
discovery: add new set-based discovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14073
diff
changeset
|
34 searching: 2 queries |
14624
f03c82d1f50a
setdiscovery: batch heads and known(ownheads)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14526
diff
changeset
|
35 query 2; still undecided: 1, sample size is: 1 |
14164
cb98fed52495
discovery: add new set-based discovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14073
diff
changeset
|
36 2 total queries |
17293
d3f84ccc5495
pushkey: add more verbose debug output regarding pushkey
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
16913
diff
changeset
|
37 listing keys for "bookmarks" |
20051
b988b3b19303
discovery: make note messages for new heads more readable
Mads Kiilerich <madski@unity3d.com>
parents:
20050
diff
changeset
|
38 new remote heads on branch 'default': |
b988b3b19303
discovery: make note messages for new heads more readable
Mads Kiilerich <madski@unity3d.com>
parents:
20050
diff
changeset
|
39 1e108cc5548c |
14525
826a13720fbc
prepush: print short hash of first new head in abort message
Adrian Buehlmann <adrian@cadifra.com>
parents:
14164
diff
changeset
|
40 abort: push creates new remote head 1e108cc5548c! |
19934
bfc6ed892349
push: hide description about "-f" in the hint to prevent from using it easily
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19840
diff
changeset
|
41 (pull and merge or see "hg help push" for details about pushing new heads) |
12998
91cb08a9e7fb
discovery: list new remote heads in prepush() on --debug
Adrian Buehlmann <adrian@cadifra.com>
parents:
12785
diff
changeset
|
42 [255] |
91cb08a9e7fb
discovery: list new remote heads in prepush() on --debug
Adrian Buehlmann <adrian@cadifra.com>
parents:
12785
diff
changeset
|
43 |
12279 | 44 $ hg pull ../a |
45 pulling from ../a | |
46 searching for changes | |
47 adding changesets | |
48 adding manifests | |
49 adding file changes | |
50 added 1 changesets with 1 changes to 1 files (+1 heads) | |
51 (run 'hg heads' to see heads, 'hg merge' to merge) | |
816
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff
changeset
|
52 |
12279 | 53 $ hg push ../a |
54 pushing to ../a | |
55 searching for changes | |
14525
826a13720fbc
prepush: print short hash of first new head in abort message
Adrian Buehlmann <adrian@cadifra.com>
parents:
14164
diff
changeset
|
56 abort: push creates new remote head 1e108cc5548c! |
19934
bfc6ed892349
push: hide description about "-f" in the hint to prevent from using it easily
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19840
diff
changeset
|
57 (merge or see "hg help push" for details about pushing new heads) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12279
diff
changeset
|
58 [255] |
12279 | 59 |
60 $ hg merge | |
61 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
62 (branch merge, don't forget to commit) | |
816
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff
changeset
|
63 |
12279 | 64 $ hg commit -m "4" |
65 $ hg push ../a | |
66 pushing to ../a | |
67 searching for changes | |
68 adding changesets | |
69 adding manifests | |
70 adding file changes | |
71 added 2 changesets with 1 changes to 1 files | |
72 | |
73 $ cd .. | |
74 | |
75 $ hg init c | |
76 $ cd c | |
77 $ for i in 0 1 2; do | |
78 > echo $i >> foo | |
79 > hg ci -Am $i | |
80 > done | |
81 adding foo | |
82 $ cd .. | |
83 | |
84 $ hg clone c d | |
85 updating to branch default | |
86 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
2021
fc22ed56afe3
Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
87 |
12279 | 88 $ cd d |
89 $ for i in 0 1; do | |
90 > hg co -C $i | |
91 > echo d-$i >> foo | |
92 > hg ci -m d-$i | |
93 > done | |
94 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
95 created new head | |
96 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
97 created new head | |
98 | |
99 $ HGMERGE=true hg merge 3 | |
100 merging foo | |
101 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
102 (branch merge, don't forget to commit) | |
103 | |
104 $ hg ci -m c-d | |
2021
fc22ed56afe3
Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
105 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
106 $ hg push ../c |
12279 | 107 pushing to ../c |
108 searching for changes | |
14525
826a13720fbc
prepush: print short hash of first new head in abort message
Adrian Buehlmann <adrian@cadifra.com>
parents:
14164
diff
changeset
|
109 abort: push creates new remote head 6346d66eb9f5! |
19934
bfc6ed892349
push: hide description about "-f" in the hint to prevent from using it easily
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19840
diff
changeset
|
110 (merge or see "hg help push" for details about pushing new heads) |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
111 [255] |
2021
fc22ed56afe3
Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
112 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
113 $ hg push -r 2 ../c |
12279 | 114 pushing to ../c |
115 searching for changes | |
116 no changes found | |
16023
90f8b8dd0326
push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents:
15615
diff
changeset
|
117 [1] |
12279 | 118 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
119 $ hg push -r 3 ../c |
12279 | 120 pushing to ../c |
121 searching for changes | |
14525
826a13720fbc
prepush: print short hash of first new head in abort message
Adrian Buehlmann <adrian@cadifra.com>
parents:
14164
diff
changeset
|
122 abort: push creates new remote head a5dda829a167! |
19934
bfc6ed892349
push: hide description about "-f" in the hint to prevent from using it easily
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19840
diff
changeset
|
123 (merge or see "hg help push" for details about pushing new heads) |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
124 [255] |
2021
fc22ed56afe3
Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
125 |
14526
4276e3202585
prepush: show details about new remote heads with --verbose
Adrian Buehlmann <adrian@cadifra.com>
parents:
14525
diff
changeset
|
126 $ hg push -v -r 3 -r 4 ../c |
12279 | 127 pushing to ../c |
128 searching for changes | |
20051
b988b3b19303
discovery: make note messages for new heads more readable
Mads Kiilerich <madski@unity3d.com>
parents:
20050
diff
changeset
|
129 new remote heads on branch 'default': |
b988b3b19303
discovery: make note messages for new heads more readable
Mads Kiilerich <madski@unity3d.com>
parents:
20050
diff
changeset
|
130 a5dda829a167 |
b988b3b19303
discovery: make note messages for new heads more readable
Mads Kiilerich <madski@unity3d.com>
parents:
20050
diff
changeset
|
131 ee8fbc7a0295 |
14525
826a13720fbc
prepush: print short hash of first new head in abort message
Adrian Buehlmann <adrian@cadifra.com>
parents:
14164
diff
changeset
|
132 abort: push creates new remote head a5dda829a167! |
19934
bfc6ed892349
push: hide description about "-f" in the hint to prevent from using it easily
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19840
diff
changeset
|
133 (merge or see "hg help push" for details about pushing new heads) |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
134 [255] |
12279 | 135 |
14526
4276e3202585
prepush: show details about new remote heads with --verbose
Adrian Buehlmann <adrian@cadifra.com>
parents:
14525
diff
changeset
|
136 $ hg push -v -f -r 3 -r 4 ../c |
12279 | 137 pushing to ../c |
138 searching for changes | |
14526
4276e3202585
prepush: show details about new remote heads with --verbose
Adrian Buehlmann <adrian@cadifra.com>
parents:
14525
diff
changeset
|
139 2 changesets found |
12279 | 140 adding changesets |
141 adding manifests | |
142 adding file changes | |
143 added 2 changesets with 2 changes to 1 files (+2 heads) | |
144 | |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
145 $ hg push -r 5 ../c |
12279 | 146 pushing to ../c |
147 searching for changes | |
148 adding changesets | |
149 adding manifests | |
150 adding file changes | |
151 added 1 changesets with 1 changes to 1 files (-1 heads) | |
2021
fc22ed56afe3
Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
152 |
12279 | 153 $ hg in ../c |
154 comparing with ../c | |
155 searching for changes | |
156 no changes found | |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12279
diff
changeset
|
157 [1] |
12279 | 158 |
159 | |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12365
diff
changeset
|
160 Issue450: push -r warns about remote head creation even if no heads |
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12365
diff
changeset
|
161 will be created |
3923
27230c29bfec
fix calculation of new heads added during push with -r
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3803
diff
changeset
|
162 |
12279 | 163 $ hg init ../e |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
164 $ hg push -r 0 ../e |
12279 | 165 pushing to ../e |
166 searching for changes | |
167 adding changesets | |
168 adding manifests | |
169 adding file changes | |
170 added 1 changesets with 1 changes to 1 files | |
171 | |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
172 $ hg push -r 1 ../e |
12279 | 173 pushing to ../e |
174 searching for changes | |
175 adding changesets | |
176 adding manifests | |
177 adding file changes | |
178 added 1 changesets with 1 changes to 1 files | |
179 | |
180 $ cd .. | |
181 | |
182 | |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12365
diff
changeset
|
183 Issue736: named branches are not considered for detection of |
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12365
diff
changeset
|
184 unmerged heads in "hg push" |
8565
268d16b2ec25
tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents:
3923
diff
changeset
|
185 |
12279 | 186 $ hg init f |
187 $ cd f | |
188 $ hg -q branch a | |
189 $ echo 0 > foo | |
190 $ hg -q ci -Am 0 | |
191 $ echo 1 > foo | |
192 $ hg -q ci -m 1 | |
193 $ hg -q up 0 | |
194 $ echo 2 > foo | |
195 $ hg -q ci -m 2 | |
196 $ hg -q up 0 | |
197 $ hg -q branch b | |
198 $ echo 3 > foo | |
199 $ hg -q ci -m 3 | |
200 $ cd .. | |
201 | |
202 $ hg -q clone f g | |
203 $ cd g | |
204 | |
205 Push on existing branch and new branch: | |
8565
268d16b2ec25
tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents:
3923
diff
changeset
|
206 |
12279 | 207 $ hg -q up 1 |
208 $ echo 4 > foo | |
209 $ hg -q ci -m 4 | |
210 $ hg -q up 0 | |
211 $ echo 5 > foo | |
212 $ hg -q branch c | |
213 $ hg -q ci -m 5 | |
214 | |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
215 $ hg push ../f |
12279 | 216 pushing to ../f |
217 searching for changes | |
218 abort: push creates new remote branches: c! | |
219 (use 'hg push --new-branch' to create new remote branches) | |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
220 [255] |
8565
268d16b2ec25
tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents:
3923
diff
changeset
|
221 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
222 $ hg push -r 4 -r 5 ../f |
12279 | 223 pushing to ../f |
224 searching for changes | |
225 abort: push creates new remote branches: c! | |
226 (use 'hg push --new-branch' to create new remote branches) | |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
227 [255] |
12279 | 228 |
229 | |
230 Multiple new branches: | |
8565
268d16b2ec25
tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents:
3923
diff
changeset
|
231 |
12279 | 232 $ hg -q branch d |
233 $ echo 6 > foo | |
234 $ hg -q ci -m 6 | |
235 | |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
236 $ hg push ../f |
12279 | 237 pushing to ../f |
238 searching for changes | |
239 abort: push creates new remote branches: c, d! | |
240 (use 'hg push --new-branch' to create new remote branches) | |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
241 [255] |
10354
844d83da2da9
prepush: warn about every new outgoing named branch, not just the first
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9954
diff
changeset
|
242 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
243 $ hg push -r 4 -r 6 ../f |
12279 | 244 pushing to ../f |
245 searching for changes | |
246 abort: push creates new remote branches: c, d! | |
247 (use 'hg push --new-branch' to create new remote branches) | |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
248 [255] |
12279 | 249 |
250 $ cd ../g | |
251 | |
252 | |
253 Fail on multiple head push: | |
254 | |
255 $ hg -q up 1 | |
256 $ echo 7 > foo | |
257 $ hg -q ci -m 7 | |
258 | |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
259 $ hg push -r 4 -r 7 ../f |
12279 | 260 pushing to ../f |
261 searching for changes | |
14525
826a13720fbc
prepush: print short hash of first new head in abort message
Adrian Buehlmann <adrian@cadifra.com>
parents:
14164
diff
changeset
|
262 abort: push creates new remote head 0b715ef6ff8f on branch 'a'! |
19934
bfc6ed892349
push: hide description about "-f" in the hint to prevent from using it easily
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19840
diff
changeset
|
263 (merge or see "hg help push" for details about pushing new heads) |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
264 [255] |
12279 | 265 |
266 Push replacement head on existing branches: | |
267 | |
268 $ hg -q up 3 | |
269 $ echo 8 > foo | |
270 $ hg -q ci -m 8 | |
8565
268d16b2ec25
tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents:
3923
diff
changeset
|
271 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
272 $ hg push -r 7 -r 8 ../f |
12279 | 273 pushing to ../f |
274 searching for changes | |
275 adding changesets | |
276 adding manifests | |
277 adding file changes | |
278 added 2 changesets with 2 changes to 1 files | |
279 | |
280 | |
281 Merge of branch a to other branch b followed by unrelated push | |
282 on branch a: | |
283 | |
284 $ hg -q up 7 | |
285 $ HGMERGE=true hg -q merge 8 | |
286 $ hg -q ci -m 9 | |
287 $ hg -q up 8 | |
288 $ echo 10 > foo | |
289 $ hg -q ci -m 10 | |
290 | |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
291 $ hg push -r 9 ../f |
12279 | 292 pushing to ../f |
293 searching for changes | |
294 adding changesets | |
295 adding manifests | |
296 adding file changes | |
297 added 1 changesets with 1 changes to 1 files (-1 heads) | |
8565
268d16b2ec25
tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents:
3923
diff
changeset
|
298 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
299 $ hg push -r 10 ../f |
12279 | 300 pushing to ../f |
301 searching for changes | |
302 adding changesets | |
303 adding manifests | |
304 adding file changes | |
305 added 1 changesets with 1 changes to 1 files (+1 heads) | |
306 | |
307 | |
308 Cheating the counting algorithm: | |
309 | |
310 $ hg -q up 9 | |
311 $ HGMERGE=true hg -q merge 2 | |
312 $ hg -q ci -m 11 | |
313 $ hg -q up 1 | |
314 $ echo 12 > foo | |
315 $ hg -q ci -m 12 | |
316 | |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
317 $ hg push -r 11 -r 12 ../f |
12279 | 318 pushing to ../f |
319 searching for changes | |
320 adding changesets | |
321 adding manifests | |
322 adding file changes | |
323 added 2 changesets with 2 changes to 1 files | |
324 | |
8565
268d16b2ec25
tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents:
3923
diff
changeset
|
325 |
12279 | 326 Failed push of new named branch: |
327 | |
328 $ echo 12 > foo | |
329 $ hg -q ci -m 12a | |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12279
diff
changeset
|
330 [1] |
12279 | 331 $ hg -q up 11 |
332 $ echo 13 > foo | |
333 $ hg -q branch e | |
334 $ hg -q ci -m 13d | |
8565
268d16b2ec25
tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents:
3923
diff
changeset
|
335 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
336 $ hg push -r 12 -r 13 ../f |
12279 | 337 pushing to ../f |
338 searching for changes | |
339 abort: push creates new remote branches: e! | |
340 (use 'hg push --new-branch' to create new remote branches) | |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
341 [255] |
12279 | 342 |
343 | |
344 Using --new-branch to push new named branch: | |
11211
e43c23d189a5
push: add --new-branch option to allow intial push of new branches
Sune Foldager <cryo@cyanite.org>
parents:
10925
diff
changeset
|
345 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
346 $ hg push --new-branch -r 12 -r 13 ../f |
12279 | 347 pushing to ../f |
348 searching for changes | |
349 adding changesets | |
350 adding manifests | |
351 adding file changes | |
352 added 1 changesets with 1 changes to 1 files | |
353 | |
19840
b00ba31313c3
discovery: abort also when pushing multiple headed new branch
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18361
diff
changeset
|
354 Pushing muliple headed new branch: |
b00ba31313c3
discovery: abort also when pushing multiple headed new branch
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18361
diff
changeset
|
355 |
b00ba31313c3
discovery: abort also when pushing multiple headed new branch
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18361
diff
changeset
|
356 $ echo 14 > foo |
b00ba31313c3
discovery: abort also when pushing multiple headed new branch
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18361
diff
changeset
|
357 $ hg -q branch f |
b00ba31313c3
discovery: abort also when pushing multiple headed new branch
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18361
diff
changeset
|
358 $ hg -q ci -m 14 |
b00ba31313c3
discovery: abort also when pushing multiple headed new branch
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18361
diff
changeset
|
359 $ echo 15 > foo |
b00ba31313c3
discovery: abort also when pushing multiple headed new branch
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18361
diff
changeset
|
360 $ hg -q ci -m 15 |
b00ba31313c3
discovery: abort also when pushing multiple headed new branch
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18361
diff
changeset
|
361 $ hg -q up 14 |
b00ba31313c3
discovery: abort also when pushing multiple headed new branch
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18361
diff
changeset
|
362 $ echo 16 > foo |
b00ba31313c3
discovery: abort also when pushing multiple headed new branch
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18361
diff
changeset
|
363 $ hg -q ci -m 16 |
b00ba31313c3
discovery: abort also when pushing multiple headed new branch
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18361
diff
changeset
|
364 $ hg push --branch f --new-branch ../f |
b00ba31313c3
discovery: abort also when pushing multiple headed new branch
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18361
diff
changeset
|
365 pushing to ../f |
b00ba31313c3
discovery: abort also when pushing multiple headed new branch
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18361
diff
changeset
|
366 searching for changes |
20050
877e05b46509
discovery: tweak error message for multiple branch heads
Mads Kiilerich <madski@unity3d.com>
parents:
19936
diff
changeset
|
367 abort: push creates new branch 'f' with multiple heads |
19936
8179eb28983b
discovery: revise hint message introduced by changeset b00ba31313c3
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
368 (merge or see "hg help push" for details about pushing new heads) |
19840
b00ba31313c3
discovery: abort also when pushing multiple headed new branch
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18361
diff
changeset
|
369 [255] |
b00ba31313c3
discovery: abort also when pushing multiple headed new branch
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18361
diff
changeset
|
370 $ hg push --branch f --new-branch --force ../f |
b00ba31313c3
discovery: abort also when pushing multiple headed new branch
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18361
diff
changeset
|
371 pushing to ../f |
b00ba31313c3
discovery: abort also when pushing multiple headed new branch
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18361
diff
changeset
|
372 searching for changes |
b00ba31313c3
discovery: abort also when pushing multiple headed new branch
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18361
diff
changeset
|
373 adding changesets |
b00ba31313c3
discovery: abort also when pushing multiple headed new branch
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18361
diff
changeset
|
374 adding manifests |
b00ba31313c3
discovery: abort also when pushing multiple headed new branch
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18361
diff
changeset
|
375 adding file changes |
b00ba31313c3
discovery: abort also when pushing multiple headed new branch
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18361
diff
changeset
|
376 added 3 changesets with 3 changes to 1 files (+1 heads) |
11211
e43c23d189a5
push: add --new-branch option to allow intial push of new branches
Sune Foldager <cryo@cyanite.org>
parents:
10925
diff
changeset
|
377 |
12785
c7d23b4ca4ba
check-code: warning and fixes for whitespace in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12399
diff
changeset
|
378 Checking prepush logic does not allow silently pushing |
12279 | 379 multiple new heads: |
380 | |
381 $ cd .. | |
382 $ hg init h | |
383 $ echo init > h/init | |
384 $ hg -R h ci -Am init | |
385 adding init | |
386 $ echo a > h/a | |
387 $ hg -R h ci -Am a | |
388 adding a | |
389 $ hg clone h i | |
390 updating to branch default | |
391 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
392 $ hg -R h up 0 | |
393 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
394 $ echo b > h/b | |
395 $ hg -R h ci -Am b | |
396 adding b | |
397 created new head | |
398 $ hg -R i up 0 | |
399 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
400 $ echo c > i/c | |
401 $ hg -R i ci -Am c | |
402 adding c | |
403 created new head | |
9479
f3569d95c2ab
push: fix subtle bug in prepush logic
Sune Foldager <cryo@cyanite.org>
parents:
8565
diff
changeset
|
404 |
12279 | 405 $ hg -R i push h |
406 pushing to h | |
407 searching for changes | |
14525
826a13720fbc
prepush: print short hash of first new head in abort message
Adrian Buehlmann <adrian@cadifra.com>
parents:
14164
diff
changeset
|
408 abort: push creates new remote head 97bd0c84d346! |
19934
bfc6ed892349
push: hide description about "-f" in the hint to prevent from using it easily
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19840
diff
changeset
|
409 (pull and merge or see "hg help push" for details about pushing new heads) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12279
diff
changeset
|
410 [255] |
12279 | 411 |
412 | |
413 Check prepush logic with merged branches: | |
414 | |
415 $ hg init j | |
416 $ hg -R j branch a | |
417 marked working directory as branch a | |
15615 | 418 (branches are permanent and global, did you want a bookmark?) |
12279 | 419 $ echo init > j/foo |
420 $ hg -R j ci -Am init | |
421 adding foo | |
422 $ hg clone j k | |
423 updating to branch a | |
424 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
425 $ echo a1 > j/foo | |
426 $ hg -R j ci -m a1 | |
427 $ hg -R k branch b | |
428 marked working directory as branch b | |
15615 | 429 (branches are permanent and global, did you want a bookmark?) |
12279 | 430 $ echo b > k/foo |
431 $ hg -R k ci -m b | |
432 $ hg -R k up 0 | |
433 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
434 | |
435 $ hg -R k merge b | |
436 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
437 (branch merge, don't forget to commit) | |
438 | |
439 $ hg -R k ci -m merge | |
9954
d6a307719ccb
fix bug in prepush logic involving merge changesets
Sune Foldager <cryo@cyanite.org>
parents:
9609
diff
changeset
|
440 |
12279 | 441 $ hg -R k push -r a j |
442 pushing to j | |
443 searching for changes | |
444 abort: push creates new remote branches: b! | |
445 (use 'hg push --new-branch' to create new remote branches) | |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12279
diff
changeset
|
446 [255] |
12279 | 447 |
448 | |
449 Prepush -r should not allow you to sneak in new heads: | |
10875
a9702c47a19f
partial backout of 1e819576e926 and add tests (issue2131)
Sune Foldager <cryo@cyanite.org>
parents:
10771
diff
changeset
|
450 |
12279 | 451 $ hg init l |
452 $ cd l | |
453 $ echo a >> foo | |
454 $ hg -q add foo | |
455 $ hg -q branch a | |
456 $ hg -q ci -ma | |
457 $ hg -q up null | |
458 $ echo a >> foo | |
459 $ hg -q add foo | |
460 $ hg -q branch b | |
461 $ hg -q ci -mb | |
462 $ cd .. | |
463 $ hg -q clone l m -u a | |
464 $ cd m | |
465 $ hg -q merge b | |
466 $ hg -q ci -mmb | |
467 $ hg -q up 0 | |
468 $ echo a >> foo | |
469 $ hg -q ci -ma2 | |
470 $ hg -q up 2 | |
471 $ echo a >> foo | |
472 $ hg -q branch -f b | |
473 $ hg -q ci -mb2 | |
474 $ hg -q merge 3 | |
475 $ hg -q ci -mma | |
476 | |
477 $ hg push ../l -b b | |
478 pushing to ../l | |
479 searching for changes | |
18361
06f075836010
discovery: process heads in sorted order
Mads Kiilerich <mads@kiilerich.com>
parents:
17293
diff
changeset
|
480 abort: push creates new remote head 451211cc22b0 on branch 'a'! |
19934
bfc6ed892349
push: hide description about "-f" in the hint to prevent from using it easily
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19840
diff
changeset
|
481 (merge or see "hg help push" for details about pushing new heads) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12279
diff
changeset
|
482 [255] |
12279 | 483 |
484 $ cd .. | |
485 | |
486 | |
487 Check prepush with new branch head on former topo non-head: | |
488 | |
489 $ hg init n | |
490 $ cd n | |
491 $ hg branch A | |
492 marked working directory as branch A | |
15615 | 493 (branches are permanent and global, did you want a bookmark?) |
12279 | 494 $ echo a >a |
495 $ hg ci -Ama | |
496 adding a | |
497 $ hg branch B | |
498 marked working directory as branch B | |
15615 | 499 (branches are permanent and global, did you want a bookmark?) |
12279 | 500 $ echo b >b |
501 $ hg ci -Amb | |
502 adding b | |
503 | |
12328
b63f6422d2a7
tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
504 b is now branch head of B, and a topological head |
b63f6422d2a7
tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
505 a is now branch head of A, but not a topological head |
12279 | 506 |
507 $ hg clone . inner | |
508 updating to branch B | |
509 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
510 $ cd inner | |
511 $ hg up B | |
512 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
513 $ echo b1 >b1 | |
514 $ hg ci -Amb1 | |
515 adding b1 | |
516 | |
12328
b63f6422d2a7
tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
517 in the clone b1 is now the head of B |
12279 | 518 |
519 $ cd .. | |
520 $ hg up 0 | |
521 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
522 $ echo a2 >a2 | |
523 $ hg ci -Ama2 | |
524 adding a2 | |
525 | |
12785
c7d23b4ca4ba
check-code: warning and fixes for whitespace in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12399
diff
changeset
|
526 a2 is now the new branch head of A, and a new topological head |
12328
b63f6422d2a7
tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
527 it replaces a former inner branch head, so it should at most warn about |
b63f6422d2a7
tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
528 A, not B |
12279 | 529 |
530 glog of local: | |
531 | |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
20051
diff
changeset
|
532 $ hg log -G --template "{rev}: {branches} {desc}\n" |
12279 | 533 @ 2: A a2 |
534 | | |
535 | o 1: B b | |
536 |/ | |
537 o 0: A a | |
538 | |
539 glog of remote: | |
540 | |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
20051
diff
changeset
|
541 $ hg log -G -R inner --template "{rev}: {branches} {desc}\n" |
12279 | 542 @ 2: B b1 |
543 | | |
544 o 1: B b | |
545 | | |
546 o 0: A a | |
547 | |
548 outgoing: | |
549 | |
550 $ hg out inner --template "{rev}: {branches} {desc}\n" | |
551 comparing with inner | |
552 searching for changes | |
553 2: A a2 | |
554 | |
555 $ hg push inner | |
556 pushing to inner | |
557 searching for changes | |
558 adding changesets | |
559 adding manifests | |
560 adding file changes | |
561 added 1 changesets with 1 changes to 1 files (+1 heads) | |
562 | |
563 $ cd .. | |
564 | |
565 | |
566 Check prepush with new branch head on former topo head: | |
10875
a9702c47a19f
partial backout of 1e819576e926 and add tests (issue2131)
Sune Foldager <cryo@cyanite.org>
parents:
10771
diff
changeset
|
567 |
12279 | 568 $ hg init o |
569 $ cd o | |
570 $ hg branch A | |
571 marked working directory as branch A | |
15615 | 572 (branches are permanent and global, did you want a bookmark?) |
12279 | 573 $ echo a >a |
574 $ hg ci -Ama | |
575 adding a | |
576 $ hg branch B | |
577 marked working directory as branch B | |
15615 | 578 (branches are permanent and global, did you want a bookmark?) |
12279 | 579 $ echo b >b |
580 $ hg ci -Amb | |
581 adding b | |
582 | |
12328
b63f6422d2a7
tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
583 b is now branch head of B, and a topological head |
12279 | 584 |
585 $ hg up 0 | |
586 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
587 $ echo a1 >a1 | |
588 $ hg ci -Ama1 | |
589 adding a1 | |
590 | |
12328
b63f6422d2a7
tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
591 a1 is now branch head of A, and a topological head |
12279 | 592 |
593 $ hg clone . inner | |
594 updating to branch A | |
595 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
596 $ cd inner | |
597 $ hg up B | |
598 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
599 $ echo b1 >b1 | |
600 $ hg ci -Amb1 | |
601 adding b1 | |
602 | |
12328
b63f6422d2a7
tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
603 in the clone b1 is now the head of B |
12279 | 604 |
605 $ cd .. | |
606 $ echo a2 >a2 | |
607 $ hg ci -Ama2 | |
608 adding a2 | |
609 | |
12328
b63f6422d2a7
tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
610 a2 is now the new branch head of A, and a topological head |
b63f6422d2a7
tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
611 it replaces a former topological and branch head, so this should not warn |
12279 | 612 |
613 glog of local: | |
614 | |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
20051
diff
changeset
|
615 $ hg log -G --template "{rev}: {branches} {desc}\n" |
12279 | 616 @ 3: A a2 |
617 | | |
618 o 2: A a1 | |
619 | | |
620 | o 1: B b | |
621 |/ | |
622 o 0: A a | |
623 | |
624 glog of remote: | |
625 | |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
20051
diff
changeset
|
626 $ hg log -G -R inner --template "{rev}: {branches} {desc}\n" |
12279 | 627 @ 3: B b1 |
628 | | |
629 | o 2: A a1 | |
630 | | | |
631 o | 1: B b | |
632 |/ | |
633 o 0: A a | |
634 | |
635 outgoing: | |
636 | |
637 $ hg out inner --template "{rev}: {branches} {desc}\n" | |
638 comparing with inner | |
639 searching for changes | |
640 3: A a2 | |
641 | |
642 $ hg push inner | |
643 pushing to inner | |
644 searching for changes | |
645 adding changesets | |
646 adding manifests | |
647 adding file changes | |
648 added 1 changesets with 1 changes to 1 files | |
649 | |
650 $ cd .. | |
651 | |
652 | |
653 Check prepush with new branch head and new child of former branch head | |
654 but child is on different branch: | |
655 | |
656 $ hg init p | |
657 $ cd p | |
658 $ hg branch A | |
659 marked working directory as branch A | |
15615 | 660 (branches are permanent and global, did you want a bookmark?) |
12279 | 661 $ echo a0 >a |
662 $ hg ci -Ama0 | |
663 adding a | |
664 $ echo a1 >a | |
665 $ hg ci -ma1 | |
666 $ hg up null | |
667 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
668 $ hg branch B | |
669 marked working directory as branch B | |
15615 | 670 (branches are permanent and global, did you want a bookmark?) |
12279 | 671 $ echo b0 >b |
672 $ hg ci -Amb0 | |
673 adding b | |
674 $ echo b1 >b | |
675 $ hg ci -mb1 | |
676 | |
677 $ hg clone . inner | |
678 updating to branch B | |
679 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
10771
01f097c4ae66
push: fix bug in prepush logic and its tests
Sune Foldager <cryo@cyanite.org>
parents:
10354
diff
changeset
|
680 |
12279 | 681 $ hg up A |
682 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
683 $ hg branch -f B | |
684 marked working directory as branch B | |
15615 | 685 (branches are permanent and global, did you want a bookmark?) |
12279 | 686 $ echo a3 >a |
687 $ hg ci -ma3 | |
688 created new head | |
689 $ hg up 3 | |
690 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
691 $ hg branch -f A | |
692 marked working directory as branch A | |
15615 | 693 (branches are permanent and global, did you want a bookmark?) |
12279 | 694 $ echo b3 >b |
695 $ hg ci -mb3 | |
696 created new head | |
10909
29a83fb8c067
prepush: add more test cases
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
10908
diff
changeset
|
697 |
12279 | 698 glog of local: |
699 | |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
20051
diff
changeset
|
700 $ hg log -G --template "{rev}: {branches} {desc}\n" |
12279 | 701 @ 5: A b3 |
702 | | |
703 | o 4: B a3 | |
704 | | | |
705 o | 3: B b1 | |
706 | | | |
707 o | 2: B b0 | |
708 / | |
709 o 1: A a1 | |
710 | | |
711 o 0: A a0 | |
712 | |
713 glog of remote: | |
10909
29a83fb8c067
prepush: add more test cases
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
10908
diff
changeset
|
714 |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
20051
diff
changeset
|
715 $ hg log -G -R inner --template "{rev}: {branches} {desc}\n" |
12279 | 716 @ 3: B b1 |
717 | | |
718 o 2: B b0 | |
719 | |
720 o 1: A a1 | |
721 | | |
722 o 0: A a0 | |
723 | |
724 outgoing: | |
725 | |
726 $ hg out inner --template "{rev}: {branches} {desc}\n" | |
727 comparing with inner | |
728 searching for changes | |
729 4: B a3 | |
730 5: A b3 | |
10909
29a83fb8c067
prepush: add more test cases
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
10908
diff
changeset
|
731 |
12279 | 732 $ hg push inner |
733 pushing to inner | |
734 searching for changes | |
14525
826a13720fbc
prepush: print short hash of first new head in abort message
Adrian Buehlmann <adrian@cadifra.com>
parents:
14164
diff
changeset
|
735 abort: push creates new remote head 7d0f4fb6cf04 on branch 'A'! |
19934
bfc6ed892349
push: hide description about "-f" in the hint to prevent from using it easily
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19840
diff
changeset
|
736 (merge or see "hg help push" for details about pushing new heads) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12279
diff
changeset
|
737 [255] |
10909
29a83fb8c067
prepush: add more test cases
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
10908
diff
changeset
|
738 |
12279 | 739 $ hg push inner -r4 -r5 |
740 pushing to inner | |
741 searching for changes | |
14525
826a13720fbc
prepush: print short hash of first new head in abort message
Adrian Buehlmann <adrian@cadifra.com>
parents:
14164
diff
changeset
|
742 abort: push creates new remote head 7d0f4fb6cf04 on branch 'A'! |
19934
bfc6ed892349
push: hide description about "-f" in the hint to prevent from using it easily
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19840
diff
changeset
|
743 (merge or see "hg help push" for details about pushing new heads) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12279
diff
changeset
|
744 [255] |
12279 | 745 |
746 $ hg in inner | |
747 comparing with inner | |
748 searching for changes | |
749 no changes found | |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12279
diff
changeset
|
750 [1] |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16023
diff
changeset
|
751 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16023
diff
changeset
|
752 $ cd .. |