Mercurial > hg
comparison tests/test-infinitepush-bundlestore.t @ 50685:b9a355763e76
backout: remove db9b6ce803a9
That changeset lost its topic for unknown reason and ended up being picked by
some automation. So I backout it previous incarnation until it can get properly
reviewed.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 20 Jun 2023 02:36:52 +0200 |
parents | db9b6ce803a9 |
children | 68c4f8f3c9f4 |
comparison
equal
deleted
inserted
replaced
50684:db9b6ce803a9 | 50685:b9a355763e76 |
---|---|
15 > echo "$1" > "$1" | 15 > echo "$1" > "$1" |
16 > hg add "$1" | 16 > hg add "$1" |
17 > hg ci -m "$1" | 17 > hg ci -m "$1" |
18 > } | 18 > } |
19 $ hg init repo | 19 $ hg init repo |
20 IMPORTANT: if you use this extension, please contact | |
21 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
22 unused and barring learning of users of this functionality, we drop this | |
23 extension in Mercurial 6.6. | |
24 $ cd repo | 20 $ cd repo |
25 | 21 |
26 Check that we can send a scratch on the server and it does not show there in | 22 Check that we can send a scratch on the server and it does not show there in |
27 the history but is stored on disk | 23 the history but is stored on disk |
28 $ setupserver | 24 $ setupserver |
29 $ cd .. | 25 $ cd .. |
30 $ hg clone ssh://user@dummy/repo client -q | 26 $ hg clone ssh://user@dummy/repo client -q |
31 remote: IMPORTANT: if you use this extension, please contact | |
32 remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
33 remote: unused and barring learning of users of this functionality, we drop this | |
34 remote: extension in Mercurial 6.6. | |
35 IMPORTANT: if you use this extension, please contact | |
36 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
37 unused and barring learning of users of this functionality, we drop this | |
38 extension in Mercurial 6.6. | |
39 IMPORTANT: if you use this extension, please contact | |
40 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
41 unused and barring learning of users of this functionality, we drop this | |
42 extension in Mercurial 6.6. | |
43 $ cd client | 27 $ cd client |
44 $ mkcommit initialcommit | 28 $ mkcommit initialcommit |
45 IMPORTANT: if you use this extension, please contact | |
46 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
47 unused and barring learning of users of this functionality, we drop this | |
48 extension in Mercurial 6.6. | |
49 IMPORTANT: if you use this extension, please contact | |
50 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
51 unused and barring learning of users of this functionality, we drop this | |
52 extension in Mercurial 6.6. | |
53 $ hg push -r . | 29 $ hg push -r . |
54 IMPORTANT: if you use this extension, please contact | 30 pushing to ssh://user@dummy/repo |
55 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
56 unused and barring learning of users of this functionality, we drop this | |
57 extension in Mercurial 6.6. | |
58 pushing to ssh://user@dummy/repo | |
59 remote: IMPORTANT: if you use this extension, please contact | |
60 remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
61 remote: unused and barring learning of users of this functionality, we drop this | |
62 remote: extension in Mercurial 6.6. | |
63 IMPORTANT: if you use this extension, please contact | |
64 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
65 unused and barring learning of users of this functionality, we drop this | |
66 extension in Mercurial 6.6. | |
67 searching for changes | 31 searching for changes |
68 remote: adding changesets | 32 remote: adding changesets |
69 remote: adding manifests | 33 remote: adding manifests |
70 remote: adding file changes | 34 remote: adding file changes |
71 remote: added 1 changesets with 1 changes to 1 files | 35 remote: added 1 changesets with 1 changes to 1 files |
72 $ mkcommit scratchcommit | 36 $ mkcommit scratchcommit |
73 IMPORTANT: if you use this extension, please contact | 37 $ hg push -r . -B scratch/mybranch |
74 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | 38 pushing to ssh://user@dummy/repo |
75 unused and barring learning of users of this functionality, we drop this | 39 searching for changes |
76 extension in Mercurial 6.6. | |
77 IMPORTANT: if you use this extension, please contact | |
78 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
79 unused and barring learning of users of this functionality, we drop this | |
80 extension in Mercurial 6.6. | |
81 $ hg push -r . -B scratch/mybranch | |
82 IMPORTANT: if you use this extension, please contact | |
83 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
84 unused and barring learning of users of this functionality, we drop this | |
85 extension in Mercurial 6.6. | |
86 pushing to ssh://user@dummy/repo | |
87 remote: IMPORTANT: if you use this extension, please contact | |
88 remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
89 remote: unused and barring learning of users of this functionality, we drop this | |
90 remote: extension in Mercurial 6.6. | |
91 IMPORTANT: if you use this extension, please contact | |
92 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
93 unused and barring learning of users of this functionality, we drop this | |
94 extension in Mercurial 6.6. | |
95 searching for changes | |
96 remote: IMPORTANT: if you use this extension, please contact | |
97 remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
98 remote: unused and barring learning of users of this functionality, we drop this | |
99 remote: extension in Mercurial 6.6. | |
100 remote: pushing 1 commit: | 40 remote: pushing 1 commit: |
101 remote: 20759b6926ce scratchcommit | 41 remote: 20759b6926ce scratchcommit |
102 $ hg log -G | 42 $ hg log -G |
103 IMPORTANT: if you use this extension, please contact | |
104 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
105 unused and barring learning of users of this functionality, we drop this | |
106 extension in Mercurial 6.6. | |
107 @ changeset: 1:20759b6926ce | 43 @ changeset: 1:20759b6926ce |
108 | bookmark: scratch/mybranch | 44 | bookmark: scratch/mybranch |
109 | tag: tip | 45 | tag: tip |
110 | user: test | 46 | user: test |
111 | date: Thu Jan 01 00:00:00 1970 +0000 | 47 | date: Thu Jan 01 00:00:00 1970 +0000 |
115 user: test | 51 user: test |
116 date: Thu Jan 01 00:00:00 1970 +0000 | 52 date: Thu Jan 01 00:00:00 1970 +0000 |
117 summary: initialcommit | 53 summary: initialcommit |
118 | 54 |
119 $ hg log -G -R ../repo | 55 $ hg log -G -R ../repo |
120 IMPORTANT: if you use this extension, please contact | |
121 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
122 unused and barring learning of users of this functionality, we drop this | |
123 extension in Mercurial 6.6. | |
124 o changeset: 0:67145f466344 | 56 o changeset: 0:67145f466344 |
125 tag: tip | 57 tag: tip |
126 user: test | 58 user: test |
127 date: Thu Jan 01 00:00:00 1970 +0000 | 59 date: Thu Jan 01 00:00:00 1970 +0000 |
128 summary: initialcommit | 60 summary: initialcommit |
142 | 74 |
143 From another client we can get the scratchbranch if we ask for it explicitely | 75 From another client we can get the scratchbranch if we ask for it explicitely |
144 | 76 |
145 $ cd .. | 77 $ cd .. |
146 $ hg clone ssh://user@dummy/repo client2 -q | 78 $ hg clone ssh://user@dummy/repo client2 -q |
147 remote: IMPORTANT: if you use this extension, please contact | |
148 remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
149 remote: unused and barring learning of users of this functionality, we drop this | |
150 remote: extension in Mercurial 6.6. | |
151 IMPORTANT: if you use this extension, please contact | |
152 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
153 unused and barring learning of users of this functionality, we drop this | |
154 extension in Mercurial 6.6. | |
155 IMPORTANT: if you use this extension, please contact | |
156 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
157 unused and barring learning of users of this functionality, we drop this | |
158 extension in Mercurial 6.6. | |
159 $ cd client2 | 79 $ cd client2 |
160 $ hg pull -B scratch/mybranch --traceback | 80 $ hg pull -B scratch/mybranch --traceback |
161 IMPORTANT: if you use this extension, please contact | |
162 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
163 unused and barring learning of users of this functionality, we drop this | |
164 extension in Mercurial 6.6. | |
165 remote: IMPORTANT: if you use this extension, please contact | |
166 remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
167 remote: unused and barring learning of users of this functionality, we drop this | |
168 remote: extension in Mercurial 6.6. | |
169 IMPORTANT: if you use this extension, please contact | |
170 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
171 unused and barring learning of users of this functionality, we drop this | |
172 extension in Mercurial 6.6. | |
173 pulling from ssh://user@dummy/repo | 81 pulling from ssh://user@dummy/repo |
174 remote: IMPORTANT: if you use this extension, please contact | 82 searching for changes |
175 remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
176 remote: unused and barring learning of users of this functionality, we drop this | |
177 remote: extension in Mercurial 6.6. | |
178 IMPORTANT: if you use this extension, please contact | |
179 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
180 unused and barring learning of users of this functionality, we drop this | |
181 extension in Mercurial 6.6. | |
182 searching for changes | |
183 remote: IMPORTANT: if you use this extension, please contact | |
184 remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
185 remote: unused and barring learning of users of this functionality, we drop this | |
186 remote: extension in Mercurial 6.6. | |
187 adding changesets | 83 adding changesets |
188 adding manifests | 84 adding manifests |
189 adding file changes | 85 adding file changes |
190 added 1 changesets with 1 changes to 1 files | 86 added 1 changesets with 1 changes to 1 files |
191 new changesets 20759b6926ce (1 drafts) | 87 new changesets 20759b6926ce (1 drafts) |
192 (run 'hg update' to get a working copy) | 88 (run 'hg update' to get a working copy) |
193 $ hg log -G | 89 $ hg log -G |
194 IMPORTANT: if you use this extension, please contact | |
195 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
196 unused and barring learning of users of this functionality, we drop this | |
197 extension in Mercurial 6.6. | |
198 o changeset: 1:20759b6926ce | 90 o changeset: 1:20759b6926ce |
199 | bookmark: scratch/mybranch | 91 | bookmark: scratch/mybranch |
200 | tag: tip | 92 | tag: tip |
201 | user: test | 93 | user: test |
202 | date: Thu Jan 01 00:00:00 1970 +0000 | 94 | date: Thu Jan 01 00:00:00 1970 +0000 |
211 | 103 |
212 Push to non-scratch bookmark | 104 Push to non-scratch bookmark |
213 | 105 |
214 $ cd client | 106 $ cd client |
215 $ hg up 0 | 107 $ hg up 0 |
216 IMPORTANT: if you use this extension, please contact | |
217 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
218 unused and barring learning of users of this functionality, we drop this | |
219 extension in Mercurial 6.6. | |
220 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 108 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
221 $ mkcommit newcommit | 109 $ mkcommit newcommit |
222 IMPORTANT: if you use this extension, please contact | |
223 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
224 unused and barring learning of users of this functionality, we drop this | |
225 extension in Mercurial 6.6. | |
226 IMPORTANT: if you use this extension, please contact | |
227 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
228 unused and barring learning of users of this functionality, we drop this | |
229 extension in Mercurial 6.6. | |
230 created new head | 110 created new head |
231 $ hg push -r . | 111 $ hg push -r . |
232 IMPORTANT: if you use this extension, please contact | 112 pushing to ssh://user@dummy/repo |
233 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
234 unused and barring learning of users of this functionality, we drop this | |
235 extension in Mercurial 6.6. | |
236 pushing to ssh://user@dummy/repo | |
237 remote: IMPORTANT: if you use this extension, please contact | |
238 remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
239 remote: unused and barring learning of users of this functionality, we drop this | |
240 remote: extension in Mercurial 6.6. | |
241 IMPORTANT: if you use this extension, please contact | |
242 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
243 unused and barring learning of users of this functionality, we drop this | |
244 extension in Mercurial 6.6. | |
245 searching for changes | 113 searching for changes |
246 remote: adding changesets | 114 remote: adding changesets |
247 remote: adding manifests | 115 remote: adding manifests |
248 remote: adding file changes | 116 remote: adding file changes |
249 remote: added 1 changesets with 1 changes to 1 files | 117 remote: added 1 changesets with 1 changes to 1 files |
250 $ hg log -G -T '{desc} {phase} {bookmarks}' | 118 $ hg log -G -T '{desc} {phase} {bookmarks}' |
251 IMPORTANT: if you use this extension, please contact | |
252 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
253 unused and barring learning of users of this functionality, we drop this | |
254 extension in Mercurial 6.6. | |
255 @ newcommit public | 119 @ newcommit public |
256 | | 120 | |
257 | o scratchcommit draft scratch/mybranch | 121 | o scratchcommit draft scratch/mybranch |
258 |/ | 122 |/ |
259 o initialcommit public | 123 o initialcommit public |
260 | 124 |
261 | 125 |
262 Push to scratch branch | 126 Push to scratch branch |
263 $ cd ../client2 | 127 $ cd ../client2 |
264 $ hg up -q scratch/mybranch | 128 $ hg up -q scratch/mybranch |
265 IMPORTANT: if you use this extension, please contact | |
266 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
267 unused and barring learning of users of this functionality, we drop this | |
268 extension in Mercurial 6.6. | |
269 $ mkcommit 'new scratch commit' | 129 $ mkcommit 'new scratch commit' |
270 IMPORTANT: if you use this extension, please contact | 130 $ hg push -r . -B scratch/mybranch |
271 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | 131 pushing to ssh://user@dummy/repo |
272 unused and barring learning of users of this functionality, we drop this | 132 searching for changes |
273 extension in Mercurial 6.6. | |
274 IMPORTANT: if you use this extension, please contact | |
275 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
276 unused and barring learning of users of this functionality, we drop this | |
277 extension in Mercurial 6.6. | |
278 $ hg push -r . -B scratch/mybranch | |
279 IMPORTANT: if you use this extension, please contact | |
280 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
281 unused and barring learning of users of this functionality, we drop this | |
282 extension in Mercurial 6.6. | |
283 pushing to ssh://user@dummy/repo | |
284 remote: IMPORTANT: if you use this extension, please contact | |
285 remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
286 remote: unused and barring learning of users of this functionality, we drop this | |
287 remote: extension in Mercurial 6.6. | |
288 IMPORTANT: if you use this extension, please contact | |
289 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
290 unused and barring learning of users of this functionality, we drop this | |
291 extension in Mercurial 6.6. | |
292 searching for changes | |
293 remote: IMPORTANT: if you use this extension, please contact | |
294 remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
295 remote: unused and barring learning of users of this functionality, we drop this | |
296 remote: extension in Mercurial 6.6. | |
297 remote: pushing 2 commits: | 133 remote: pushing 2 commits: |
298 remote: 20759b6926ce scratchcommit | 134 remote: 20759b6926ce scratchcommit |
299 remote: 1de1d7d92f89 new scratch commit | 135 remote: 1de1d7d92f89 new scratch commit |
300 $ hg log -G -T '{desc} {phase} {bookmarks}' | 136 $ hg log -G -T '{desc} {phase} {bookmarks}' |
301 IMPORTANT: if you use this extension, please contact | |
302 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
303 unused and barring learning of users of this functionality, we drop this | |
304 extension in Mercurial 6.6. | |
305 @ new scratch commit draft scratch/mybranch | 137 @ new scratch commit draft scratch/mybranch |
306 | | 138 | |
307 o scratchcommit draft | 139 o scratchcommit draft |
308 | | 140 | |
309 o initialcommit public | 141 o initialcommit public |
315 $ scratchbookmarks | 147 $ scratchbookmarks |
316 scratch/mybranch 1de1d7d92f8965260391d0513fe8a8d5973d3042 | 148 scratch/mybranch 1de1d7d92f8965260391d0513fe8a8d5973d3042 |
317 | 149 |
318 Push scratch bookmark with no new revs | 150 Push scratch bookmark with no new revs |
319 $ hg push -r . -B scratch/anotherbranch | 151 $ hg push -r . -B scratch/anotherbranch |
320 IMPORTANT: if you use this extension, please contact | 152 pushing to ssh://user@dummy/repo |
321 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | 153 searching for changes |
322 unused and barring learning of users of this functionality, we drop this | |
323 extension in Mercurial 6.6. | |
324 pushing to ssh://user@dummy/repo | |
325 remote: IMPORTANT: if you use this extension, please contact | |
326 remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
327 remote: unused and barring learning of users of this functionality, we drop this | |
328 remote: extension in Mercurial 6.6. | |
329 IMPORTANT: if you use this extension, please contact | |
330 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
331 unused and barring learning of users of this functionality, we drop this | |
332 extension in Mercurial 6.6. | |
333 searching for changes | |
334 remote: IMPORTANT: if you use this extension, please contact | |
335 remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
336 remote: unused and barring learning of users of this functionality, we drop this | |
337 remote: extension in Mercurial 6.6. | |
338 remote: pushing 2 commits: | 154 remote: pushing 2 commits: |
339 remote: 20759b6926ce scratchcommit | 155 remote: 20759b6926ce scratchcommit |
340 remote: 1de1d7d92f89 new scratch commit | 156 remote: 1de1d7d92f89 new scratch commit |
341 $ hg log -G -T '{desc} {phase} {bookmarks}' | 157 $ hg log -G -T '{desc} {phase} {bookmarks}' |
342 IMPORTANT: if you use this extension, please contact | |
343 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
344 unused and barring learning of users of this functionality, we drop this | |
345 extension in Mercurial 6.6. | |
346 @ new scratch commit draft scratch/anotherbranch scratch/mybranch | 158 @ new scratch commit draft scratch/anotherbranch scratch/mybranch |
347 | | 159 | |
348 o scratchcommit draft | 160 o scratchcommit draft |
349 | | 161 | |
350 o initialcommit public | 162 o initialcommit public |
354 scratch/mybranch 1de1d7d92f8965260391d0513fe8a8d5973d3042 | 166 scratch/mybranch 1de1d7d92f8965260391d0513fe8a8d5973d3042 |
355 | 167 |
356 Pull scratch and non-scratch bookmark at the same time | 168 Pull scratch and non-scratch bookmark at the same time |
357 | 169 |
358 $ hg -R ../repo book newbook | 170 $ hg -R ../repo book newbook |
359 IMPORTANT: if you use this extension, please contact | |
360 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
361 unused and barring learning of users of this functionality, we drop this | |
362 extension in Mercurial 6.6. | |
363 $ cd ../client | 171 $ cd ../client |
364 $ hg pull -B newbook -B scratch/mybranch --traceback | 172 $ hg pull -B newbook -B scratch/mybranch --traceback |
365 IMPORTANT: if you use this extension, please contact | |
366 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
367 unused and barring learning of users of this functionality, we drop this | |
368 extension in Mercurial 6.6. | |
369 remote: IMPORTANT: if you use this extension, please contact | |
370 remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
371 remote: unused and barring learning of users of this functionality, we drop this | |
372 remote: extension in Mercurial 6.6. | |
373 IMPORTANT: if you use this extension, please contact | |
374 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
375 unused and barring learning of users of this functionality, we drop this | |
376 extension in Mercurial 6.6. | |
377 pulling from ssh://user@dummy/repo | 173 pulling from ssh://user@dummy/repo |
378 remote: IMPORTANT: if you use this extension, please contact | 174 searching for changes |
379 remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
380 remote: unused and barring learning of users of this functionality, we drop this | |
381 remote: extension in Mercurial 6.6. | |
382 IMPORTANT: if you use this extension, please contact | |
383 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
384 unused and barring learning of users of this functionality, we drop this | |
385 extension in Mercurial 6.6. | |
386 searching for changes | |
387 remote: IMPORTANT: if you use this extension, please contact | |
388 remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
389 remote: unused and barring learning of users of this functionality, we drop this | |
390 remote: extension in Mercurial 6.6. | |
391 adding changesets | 175 adding changesets |
392 adding manifests | 176 adding manifests |
393 adding file changes | 177 adding file changes |
394 adding remote bookmark newbook | 178 adding remote bookmark newbook |
395 added 1 changesets with 1 changes to 2 files | 179 added 1 changesets with 1 changes to 2 files |
396 new changesets 1de1d7d92f89 (1 drafts) | 180 new changesets 1de1d7d92f89 (1 drafts) |
397 (run 'hg update' to get a working copy) | 181 (run 'hg update' to get a working copy) |
398 $ hg log -G -T '{desc} {phase} {bookmarks}' | 182 $ hg log -G -T '{desc} {phase} {bookmarks}' |
399 IMPORTANT: if you use this extension, please contact | |
400 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
401 unused and barring learning of users of this functionality, we drop this | |
402 extension in Mercurial 6.6. | |
403 o new scratch commit draft scratch/mybranch | 183 o new scratch commit draft scratch/mybranch |
404 | | 184 | |
405 | @ newcommit public | 185 | @ newcommit public |
406 | | | 186 | | |
407 o | scratchcommit draft | 187 o | scratchcommit draft |
410 | 190 |
411 | 191 |
412 Push scratch revision without bookmark with --bundle-store | 192 Push scratch revision without bookmark with --bundle-store |
413 | 193 |
414 $ hg up -q tip | 194 $ hg up -q tip |
415 IMPORTANT: if you use this extension, please contact | |
416 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
417 unused and barring learning of users of this functionality, we drop this | |
418 extension in Mercurial 6.6. | |
419 $ mkcommit scratchcommitnobook | 195 $ mkcommit scratchcommitnobook |
420 IMPORTANT: if you use this extension, please contact | 196 $ hg log -G -T '{desc} {phase} {bookmarks}' |
421 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
422 unused and barring learning of users of this functionality, we drop this | |
423 extension in Mercurial 6.6. | |
424 IMPORTANT: if you use this extension, please contact | |
425 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
426 unused and barring learning of users of this functionality, we drop this | |
427 extension in Mercurial 6.6. | |
428 $ hg log -G -T '{desc} {phase} {bookmarks}' | |
429 IMPORTANT: if you use this extension, please contact | |
430 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
431 unused and barring learning of users of this functionality, we drop this | |
432 extension in Mercurial 6.6. | |
433 @ scratchcommitnobook draft | 197 @ scratchcommitnobook draft |
434 | | 198 | |
435 o new scratch commit draft scratch/mybranch | 199 o new scratch commit draft scratch/mybranch |
436 | | 200 | |
437 | o newcommit public | 201 | o newcommit public |
439 o | scratchcommit draft | 203 o | scratchcommit draft |
440 |/ | 204 |/ |
441 o initialcommit public | 205 o initialcommit public |
442 | 206 |
443 $ hg push -r . --bundle-store | 207 $ hg push -r . --bundle-store |
444 IMPORTANT: if you use this extension, please contact | 208 pushing to ssh://user@dummy/repo |
445 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | 209 searching for changes |
446 unused and barring learning of users of this functionality, we drop this | |
447 extension in Mercurial 6.6. | |
448 pushing to ssh://user@dummy/repo | |
449 remote: IMPORTANT: if you use this extension, please contact | |
450 remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
451 remote: unused and barring learning of users of this functionality, we drop this | |
452 remote: extension in Mercurial 6.6. | |
453 IMPORTANT: if you use this extension, please contact | |
454 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
455 unused and barring learning of users of this functionality, we drop this | |
456 extension in Mercurial 6.6. | |
457 searching for changes | |
458 remote: IMPORTANT: if you use this extension, please contact | |
459 remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
460 remote: unused and barring learning of users of this functionality, we drop this | |
461 remote: extension in Mercurial 6.6. | |
462 remote: pushing 3 commits: | 210 remote: pushing 3 commits: |
463 remote: 20759b6926ce scratchcommit | 211 remote: 20759b6926ce scratchcommit |
464 remote: 1de1d7d92f89 new scratch commit | 212 remote: 1de1d7d92f89 new scratch commit |
465 remote: 2b5d271c7e0d scratchcommitnobook | 213 remote: 2b5d271c7e0d scratchcommitnobook |
466 $ hg -R ../repo log -G -T '{desc} {phase}' | 214 $ hg -R ../repo log -G -T '{desc} {phase}' |
467 IMPORTANT: if you use this extension, please contact | |
468 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
469 unused and barring learning of users of this functionality, we drop this | |
470 extension in Mercurial 6.6. | |
471 o newcommit public | 215 o newcommit public |
472 | | 216 | |
473 o initialcommit public | 217 o initialcommit public |
474 | 218 |
475 | 219 |
478 20759b6926ce827d5a8c73eb1fa9726d6f7defb2 66fa08ff107451320512817bed42b7f467a1bec3 | 222 20759b6926ce827d5a8c73eb1fa9726d6f7defb2 66fa08ff107451320512817bed42b7f467a1bec3 |
479 2b5d271c7e0d25d811359a314d413ebcc75c9524 66fa08ff107451320512817bed42b7f467a1bec3 | 223 2b5d271c7e0d25d811359a314d413ebcc75c9524 66fa08ff107451320512817bed42b7f467a1bec3 |
480 | 224 |
481 Test with pushrebase | 225 Test with pushrebase |
482 $ mkcommit scratchcommitwithpushrebase | 226 $ mkcommit scratchcommitwithpushrebase |
483 IMPORTANT: if you use this extension, please contact | 227 $ hg push -r . -B scratch/mybranch |
484 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | 228 pushing to ssh://user@dummy/repo |
485 unused and barring learning of users of this functionality, we drop this | 229 searching for changes |
486 extension in Mercurial 6.6. | |
487 IMPORTANT: if you use this extension, please contact | |
488 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
489 unused and barring learning of users of this functionality, we drop this | |
490 extension in Mercurial 6.6. | |
491 $ hg push -r . -B scratch/mybranch | |
492 IMPORTANT: if you use this extension, please contact | |
493 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
494 unused and barring learning of users of this functionality, we drop this | |
495 extension in Mercurial 6.6. | |
496 pushing to ssh://user@dummy/repo | |
497 remote: IMPORTANT: if you use this extension, please contact | |
498 remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
499 remote: unused and barring learning of users of this functionality, we drop this | |
500 remote: extension in Mercurial 6.6. | |
501 IMPORTANT: if you use this extension, please contact | |
502 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
503 unused and barring learning of users of this functionality, we drop this | |
504 extension in Mercurial 6.6. | |
505 searching for changes | |
506 remote: IMPORTANT: if you use this extension, please contact | |
507 remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
508 remote: unused and barring learning of users of this functionality, we drop this | |
509 remote: extension in Mercurial 6.6. | |
510 remote: pushing 4 commits: | 230 remote: pushing 4 commits: |
511 remote: 20759b6926ce scratchcommit | 231 remote: 20759b6926ce scratchcommit |
512 remote: 1de1d7d92f89 new scratch commit | 232 remote: 1de1d7d92f89 new scratch commit |
513 remote: 2b5d271c7e0d scratchcommitnobook | 233 remote: 2b5d271c7e0d scratchcommitnobook |
514 remote: d8c4f54ab678 scratchcommitwithpushrebase | 234 remote: d8c4f54ab678 scratchcommitwithpushrebase |
515 $ hg -R ../repo log -G -T '{desc} {phase}' | 235 $ hg -R ../repo log -G -T '{desc} {phase}' |
516 IMPORTANT: if you use this extension, please contact | |
517 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
518 unused and barring learning of users of this functionality, we drop this | |
519 extension in Mercurial 6.6. | |
520 o newcommit public | 236 o newcommit public |
521 | | 237 | |
522 o initialcommit public | 238 o initialcommit public |
523 | 239 |
524 $ scratchnodes | 240 $ scratchnodes |
527 2b5d271c7e0d25d811359a314d413ebcc75c9524 e3cb2ac50f9e1e6a5ead3217fc21236c84af4397 | 243 2b5d271c7e0d25d811359a314d413ebcc75c9524 e3cb2ac50f9e1e6a5ead3217fc21236c84af4397 |
528 d8c4f54ab678fd67cb90bb3f272a2dc6513a59a7 e3cb2ac50f9e1e6a5ead3217fc21236c84af4397 | 244 d8c4f54ab678fd67cb90bb3f272a2dc6513a59a7 e3cb2ac50f9e1e6a5ead3217fc21236c84af4397 |
529 | 245 |
530 Change the order of pushrebase and infinitepush | 246 Change the order of pushrebase and infinitepush |
531 $ mkcommit scratchcommitwithpushrebase2 | 247 $ mkcommit scratchcommitwithpushrebase2 |
532 IMPORTANT: if you use this extension, please contact | 248 $ hg push -r . -B scratch/mybranch |
533 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | 249 pushing to ssh://user@dummy/repo |
534 unused and barring learning of users of this functionality, we drop this | 250 searching for changes |
535 extension in Mercurial 6.6. | |
536 IMPORTANT: if you use this extension, please contact | |
537 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
538 unused and barring learning of users of this functionality, we drop this | |
539 extension in Mercurial 6.6. | |
540 $ hg push -r . -B scratch/mybranch | |
541 IMPORTANT: if you use this extension, please contact | |
542 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
543 unused and barring learning of users of this functionality, we drop this | |
544 extension in Mercurial 6.6. | |
545 pushing to ssh://user@dummy/repo | |
546 remote: IMPORTANT: if you use this extension, please contact | |
547 remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
548 remote: unused and barring learning of users of this functionality, we drop this | |
549 remote: extension in Mercurial 6.6. | |
550 IMPORTANT: if you use this extension, please contact | |
551 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
552 unused and barring learning of users of this functionality, we drop this | |
553 extension in Mercurial 6.6. | |
554 searching for changes | |
555 remote: IMPORTANT: if you use this extension, please contact | |
556 remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
557 remote: unused and barring learning of users of this functionality, we drop this | |
558 remote: extension in Mercurial 6.6. | |
559 remote: pushing 5 commits: | 251 remote: pushing 5 commits: |
560 remote: 20759b6926ce scratchcommit | 252 remote: 20759b6926ce scratchcommit |
561 remote: 1de1d7d92f89 new scratch commit | 253 remote: 1de1d7d92f89 new scratch commit |
562 remote: 2b5d271c7e0d scratchcommitnobook | 254 remote: 2b5d271c7e0d scratchcommitnobook |
563 remote: d8c4f54ab678 scratchcommitwithpushrebase | 255 remote: d8c4f54ab678 scratchcommitwithpushrebase |
564 remote: 6c10d49fe927 scratchcommitwithpushrebase2 | 256 remote: 6c10d49fe927 scratchcommitwithpushrebase2 |
565 $ hg -R ../repo log -G -T '{desc} {phase}' | 257 $ hg -R ../repo log -G -T '{desc} {phase}' |
566 IMPORTANT: if you use this extension, please contact | |
567 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
568 unused and barring learning of users of this functionality, we drop this | |
569 extension in Mercurial 6.6. | |
570 o newcommit public | 258 o newcommit public |
571 | | 259 | |
572 o initialcommit public | 260 o initialcommit public |
573 | 261 |
574 $ scratchnodes | 262 $ scratchnodes |
579 d8c4f54ab678fd67cb90bb3f272a2dc6513a59a7 cd0586065eaf8b483698518f5fc32531e36fd8e0 | 267 d8c4f54ab678fd67cb90bb3f272a2dc6513a59a7 cd0586065eaf8b483698518f5fc32531e36fd8e0 |
580 | 268 |
581 Non-fastforward scratch bookmark push | 269 Non-fastforward scratch bookmark push |
582 | 270 |
583 $ hg log -GT "{rev}:{node} {desc}\n" | 271 $ hg log -GT "{rev}:{node} {desc}\n" |
584 IMPORTANT: if you use this extension, please contact | |
585 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
586 unused and barring learning of users of this functionality, we drop this | |
587 extension in Mercurial 6.6. | |
588 @ 6:6c10d49fe92751666c40263f96721b918170d3da scratchcommitwithpushrebase2 | 272 @ 6:6c10d49fe92751666c40263f96721b918170d3da scratchcommitwithpushrebase2 |
589 | | 273 | |
590 o 5:d8c4f54ab678fd67cb90bb3f272a2dc6513a59a7 scratchcommitwithpushrebase | 274 o 5:d8c4f54ab678fd67cb90bb3f272a2dc6513a59a7 scratchcommitwithpushrebase |
591 | | 275 | |
592 o 4:2b5d271c7e0d25d811359a314d413ebcc75c9524 scratchcommitnobook | 276 o 4:2b5d271c7e0d25d811359a314d413ebcc75c9524 scratchcommitnobook |
598 o | 1:20759b6926ce827d5a8c73eb1fa9726d6f7defb2 scratchcommit | 282 o | 1:20759b6926ce827d5a8c73eb1fa9726d6f7defb2 scratchcommit |
599 |/ | 283 |/ |
600 o 0:67145f4663446a9580364f70034fea6e21293b6f initialcommit | 284 o 0:67145f4663446a9580364f70034fea6e21293b6f initialcommit |
601 | 285 |
602 $ hg up 6c10d49fe927 | 286 $ hg up 6c10d49fe927 |
603 IMPORTANT: if you use this extension, please contact | |
604 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
605 unused and barring learning of users of this functionality, we drop this | |
606 extension in Mercurial 6.6. | |
607 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 287 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
608 $ echo 1 > amend | 288 $ echo 1 > amend |
609 $ hg add amend | 289 $ hg add amend |
610 IMPORTANT: if you use this extension, please contact | |
611 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
612 unused and barring learning of users of this functionality, we drop this | |
613 extension in Mercurial 6.6. | |
614 $ hg ci --amend -m 'scratch amended commit' | 290 $ hg ci --amend -m 'scratch amended commit' |
615 IMPORTANT: if you use this extension, please contact | |
616 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
617 unused and barring learning of users of this functionality, we drop this | |
618 extension in Mercurial 6.6. | |
619 saved backup bundle to $TESTTMP/client/.hg/strip-backup/6c10d49fe927-c99ffec5-amend.hg | 291 saved backup bundle to $TESTTMP/client/.hg/strip-backup/6c10d49fe927-c99ffec5-amend.hg |
620 $ hg log -G -T '{desc} {phase} {bookmarks}' | 292 $ hg log -G -T '{desc} {phase} {bookmarks}' |
621 IMPORTANT: if you use this extension, please contact | |
622 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
623 unused and barring learning of users of this functionality, we drop this | |
624 extension in Mercurial 6.6. | |
625 @ scratch amended commit draft scratch/mybranch | 293 @ scratch amended commit draft scratch/mybranch |
626 | | 294 | |
627 o scratchcommitwithpushrebase draft | 295 o scratchcommitwithpushrebase draft |
628 | | 296 | |
629 o scratchcommitnobook draft | 297 o scratchcommitnobook draft |
639 | 307 |
640 $ scratchbookmarks | 308 $ scratchbookmarks |
641 scratch/anotherbranch 1de1d7d92f8965260391d0513fe8a8d5973d3042 | 309 scratch/anotherbranch 1de1d7d92f8965260391d0513fe8a8d5973d3042 |
642 scratch/mybranch 6c10d49fe92751666c40263f96721b918170d3da | 310 scratch/mybranch 6c10d49fe92751666c40263f96721b918170d3da |
643 $ hg push -r . -B scratch/mybranch | 311 $ hg push -r . -B scratch/mybranch |
644 IMPORTANT: if you use this extension, please contact | 312 pushing to ssh://user@dummy/repo |
645 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | 313 searching for changes |
646 unused and barring learning of users of this functionality, we drop this | |
647 extension in Mercurial 6.6. | |
648 pushing to ssh://user@dummy/repo | |
649 remote: IMPORTANT: if you use this extension, please contact | |
650 remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
651 remote: unused and barring learning of users of this functionality, we drop this | |
652 remote: extension in Mercurial 6.6. | |
653 IMPORTANT: if you use this extension, please contact | |
654 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
655 unused and barring learning of users of this functionality, we drop this | |
656 extension in Mercurial 6.6. | |
657 searching for changes | |
658 remote: IMPORTANT: if you use this extension, please contact | |
659 remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
660 remote: unused and barring learning of users of this functionality, we drop this | |
661 remote: extension in Mercurial 6.6. | |
662 remote: pushing 5 commits: | 314 remote: pushing 5 commits: |
663 remote: 20759b6926ce scratchcommit | 315 remote: 20759b6926ce scratchcommit |
664 remote: 1de1d7d92f89 new scratch commit | 316 remote: 1de1d7d92f89 new scratch commit |
665 remote: 2b5d271c7e0d scratchcommitnobook | 317 remote: 2b5d271c7e0d scratchcommitnobook |
666 remote: d8c4f54ab678 scratchcommitwithpushrebase | 318 remote: d8c4f54ab678 scratchcommitwithpushrebase |
667 remote: 8872775dd97a scratch amended commit | 319 remote: 8872775dd97a scratch amended commit |
668 $ scratchbookmarks | 320 $ scratchbookmarks |
669 scratch/anotherbranch 1de1d7d92f8965260391d0513fe8a8d5973d3042 | 321 scratch/anotherbranch 1de1d7d92f8965260391d0513fe8a8d5973d3042 |
670 scratch/mybranch 8872775dd97a750e1533dc1fbbca665644b32547 | 322 scratch/mybranch 8872775dd97a750e1533dc1fbbca665644b32547 |
671 $ hg log -G -T '{desc} {phase} {bookmarks}' | 323 $ hg log -G -T '{desc} {phase} {bookmarks}' |
672 IMPORTANT: if you use this extension, please contact | |
673 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
674 unused and barring learning of users of this functionality, we drop this | |
675 extension in Mercurial 6.6. | |
676 @ scratch amended commit draft scratch/mybranch | 324 @ scratch amended commit draft scratch/mybranch |
677 | | 325 | |
678 o scratchcommitwithpushrebase draft | 326 o scratchcommitwithpushrebase draft |
679 | | 327 | |
680 o scratchcommitnobook draft | 328 o scratchcommitnobook draft |
693 > peer=ssh://user@dummy/client2 | 341 > peer=ssh://user@dummy/client2 |
694 > EOF | 342 > EOF |
695 | 343 |
696 Checkout last non-scrath commit | 344 Checkout last non-scrath commit |
697 $ hg up 91894e11e8255 | 345 $ hg up 91894e11e8255 |
698 IMPORTANT: if you use this extension, please contact | |
699 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
700 unused and barring learning of users of this functionality, we drop this | |
701 extension in Mercurial 6.6. | |
702 1 files updated, 0 files merged, 6 files removed, 0 files unresolved | 346 1 files updated, 0 files merged, 6 files removed, 0 files unresolved |
703 $ mkcommit peercommit | 347 $ mkcommit peercommit |
704 IMPORTANT: if you use this extension, please contact | |
705 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
706 unused and barring learning of users of this functionality, we drop this | |
707 extension in Mercurial 6.6. | |
708 IMPORTANT: if you use this extension, please contact | |
709 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
710 unused and barring learning of users of this functionality, we drop this | |
711 extension in Mercurial 6.6. | |
712 Use --force because this push creates new head | 348 Use --force because this push creates new head |
713 $ hg push peer -r . -f | 349 $ hg push peer -r . -f |
714 IMPORTANT: if you use this extension, please contact | |
715 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
716 unused and barring learning of users of this functionality, we drop this | |
717 extension in Mercurial 6.6. | |
718 pushing to ssh://user@dummy/client2 | 350 pushing to ssh://user@dummy/client2 |
719 remote: IMPORTANT: if you use this extension, please contact | |
720 remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
721 remote: unused and barring learning of users of this functionality, we drop this | |
722 remote: extension in Mercurial 6.6. | |
723 IMPORTANT: if you use this extension, please contact | |
724 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
725 unused and barring learning of users of this functionality, we drop this | |
726 extension in Mercurial 6.6. | |
727 searching for changes | 351 searching for changes |
728 remote: adding changesets | 352 remote: adding changesets |
729 remote: adding manifests | 353 remote: adding manifests |
730 remote: adding file changes | 354 remote: adding file changes |
731 remote: added 2 changesets with 2 changes to 2 files (+1 heads) | 355 remote: added 2 changesets with 2 changes to 2 files (+1 heads) |
732 $ hg -R ../repo log -G -T '{desc} {phase} {bookmarks}' | 356 $ hg -R ../repo log -G -T '{desc} {phase} {bookmarks}' |
733 IMPORTANT: if you use this extension, please contact | |
734 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
735 unused and barring learning of users of this functionality, we drop this | |
736 extension in Mercurial 6.6. | |
737 o newcommit public | 357 o newcommit public |
738 | | 358 | |
739 o initialcommit public | 359 o initialcommit public |
740 | 360 |
741 $ hg -R ../client2 log -G -T '{desc} {phase} {bookmarks}' | 361 $ hg -R ../client2 log -G -T '{desc} {phase} {bookmarks}' |
742 IMPORTANT: if you use this extension, please contact | |
743 mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |
744 unused and barring learning of users of this functionality, we drop this | |
745 extension in Mercurial 6.6. | |
746 o peercommit public | 362 o peercommit public |
747 | | 363 | |
748 o newcommit public | 364 o newcommit public |
749 | | 365 | |
750 | @ new scratch commit draft scratch/anotherbranch scratch/mybranch | 366 | @ new scratch commit draft scratch/anotherbranch scratch/mybranch |