Show More
@@ -154,6 +154,18 b' configitem = registrar.configitem(config' | |||||
154 |
|
154 | |||
155 | configitem( |
|
155 | configitem( | |
156 | b'infinitepush', |
|
156 | b'infinitepush', | |
|
157 | b'deprecation-message', | |||
|
158 | default=True, | |||
|
159 | ) | |||
|
160 | ||||
|
161 | configitem( | |||
|
162 | b'infinitepush', | |||
|
163 | b'deprecation-abort', | |||
|
164 | default=True, | |||
|
165 | ) | |||
|
166 | ||||
|
167 | configitem( | |||
|
168 | b'infinitepush', | |||
157 | b'server', |
|
169 | b'server', | |
158 | default=False, |
|
170 | default=False, | |
159 | ) |
|
171 | ) | |
@@ -317,7 +329,20 b' def _isserver(ui):' | |||||
317 | return ui.configbool(b'infinitepush', b'server') |
|
329 | return ui.configbool(b'infinitepush', b'server') | |
318 |
|
330 | |||
319 |
|
331 | |||
|
332 | WARNING_MSG = b"""IMPORTANT: if you use this extension, please contact | |||
|
333 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
334 | unused and barring learning of users of this functionality, we drop this | |||
|
335 | extension in Mercurial 6.6. | |||
|
336 | """ | |||
|
337 | ||||
|
338 | ||||
320 | def reposetup(ui, repo): |
|
339 | def reposetup(ui, repo): | |
|
340 | if ui.configbool(b'infinitepush', b'deprecation-message'): | |||
|
341 | ui.write_err(WARNING_MSG) | |||
|
342 | if ui.configbool(b'infinitepush', b'deprecation-abort'): | |||
|
343 | msg = b"USING EXTENSION INFINITE PUSH DESPITE PENDING DROP" | |||
|
344 | hint = b"contact mercurial-devel@mercurial-scm.org" | |||
|
345 | raise error.Abort(msg, hint=hint) | |||
321 | if _isserver(ui) and repo.local(): |
|
346 | if _isserver(ui) and repo.local(): | |
322 | repo.bundlestore = bundlestore(repo) |
|
347 | repo.bundlestore = bundlestore(repo) | |
323 |
|
348 |
@@ -16,6 +16,9 b' setupcommon() {' | |||||
16 | infinitepush= |
|
16 | infinitepush= | |
17 | [infinitepush] |
|
17 | [infinitepush] | |
18 | branchpattern=re:scratch/.* |
|
18 | branchpattern=re:scratch/.* | |
|
19 | deprecation-abort=no | |||
|
20 | deprecation-message=yes | |||
|
21 | ||||
19 | EOF |
|
22 | EOF | |
20 | } |
|
23 | } | |
21 |
|
24 |
@@ -17,6 +17,10 b' Create an ondisk bundlestore in .hg/scra' | |||||
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. | |||
20 | $ cd repo |
|
24 | $ cd repo | |
21 |
|
25 | |||
22 | Check that we can send a scratch on the server and it does not show there in |
|
26 | Check that we can send a scratch on the server and it does not show there in | |
@@ -24,22 +28,82 b' the history but is stored on disk' | |||||
24 | $ setupserver |
|
28 | $ setupserver | |
25 | $ cd .. |
|
29 | $ cd .. | |
26 | $ hg clone ssh://user@dummy/repo client -q |
|
30 | $ 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. | |||
27 |
$ |
|
43 | $ cd client | |
28 | $ mkcommit initialcommit |
|
44 | $ 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. | |||
29 | $ hg push -r . |
|
53 | $ hg push -r . | |
|
54 | IMPORTANT: if you use this extension, please contact | |||
|
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. | |||
30 | pushing to ssh://user@dummy/repo |
|
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. | |||
31 | searching for changes |
|
67 | searching for changes | |
32 | remote: adding changesets |
|
68 | remote: adding changesets | |
33 | remote: adding manifests |
|
69 | remote: adding manifests | |
34 | remote: adding file changes |
|
70 | remote: adding file changes | |
35 | remote: added 1 changesets with 1 changes to 1 files |
|
71 | remote: added 1 changesets with 1 changes to 1 files | |
36 | $ mkcommit scratchcommit |
|
72 | $ mkcommit scratchcommit | |
|
73 | IMPORTANT: if you use this extension, please contact | |||
|
74 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
75 | unused and barring learning of users of this functionality, we drop this | |||
|
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. | |||
37 | $ hg push -r . -B scratch/mybranch |
|
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. | |||
38 | pushing to ssh://user@dummy/repo |
|
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. | |||
39 | searching for changes |
|
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. | |||
40 | remote: pushing 1 commit: |
|
100 | remote: pushing 1 commit: | |
41 | remote: 20759b6926ce scratchcommit |
|
101 | remote: 20759b6926ce scratchcommit | |
42 | $ hg log -G |
|
102 | $ 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. | |||
43 | @ changeset: 1:20759b6926ce |
|
107 | @ changeset: 1:20759b6926ce | |
44 | | bookmark: scratch/mybranch |
|
108 | | bookmark: scratch/mybranch | |
45 | | tag: tip |
|
109 | | tag: tip | |
@@ -53,6 +117,10 b' the history but is stored on disk' | |||||
53 | summary: initialcommit |
|
117 | summary: initialcommit | |
54 |
|
118 | |||
55 | $ hg log -G -R ../repo |
|
119 | $ 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. | |||
56 | o changeset: 0:67145f466344 |
|
124 | o changeset: 0:67145f466344 | |
57 | tag: tip |
|
125 | tag: tip | |
58 | user: test |
|
126 | user: test | |
@@ -76,10 +144,46 b' From another client we can get the scrat' | |||||
76 |
|
144 | |||
77 | $ cd .. |
|
145 | $ cd .. | |
78 | $ hg clone ssh://user@dummy/repo client2 -q |
|
146 | $ 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. | |||
79 |
$ |
|
159 | $ cd client2 | |
80 | $ hg pull -B scratch/mybranch --traceback |
|
160 | $ 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. | |||
81 | pulling from ssh://user@dummy/repo |
|
173 | pulling from ssh://user@dummy/repo | |
|
174 | remote: IMPORTANT: if you use this extension, please contact | |||
|
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. | |||
82 | searching for changes |
|
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. | |||
83 | adding changesets |
|
187 | adding changesets | |
84 | adding manifests |
|
188 | adding manifests | |
85 | adding file changes |
|
189 | adding file changes | |
@@ -87,6 +191,10 b' From another client we can get the scrat' | |||||
87 | new changesets 20759b6926ce (1 drafts) |
|
191 | new changesets 20759b6926ce (1 drafts) | |
88 | (run 'hg update' to get a working copy) |
|
192 | (run 'hg update' to get a working copy) | |
89 | $ hg log -G |
|
193 | $ 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. | |||
90 | o changeset: 1:20759b6926ce |
|
198 | o changeset: 1:20759b6926ce | |
91 | | bookmark: scratch/mybranch |
|
199 | | bookmark: scratch/mybranch | |
92 | | tag: tip |
|
200 | | tag: tip | |
@@ -105,17 +213,45 b' Push to non-scratch bookmark' | |||||
105 |
|
213 | |||
106 | $ cd client |
|
214 | $ cd client | |
107 | $ hg up 0 |
|
215 | $ 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. | |||
108 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
220 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
109 | $ mkcommit newcommit |
|
221 | $ 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. | |||
110 | created new head |
|
230 | created new head | |
111 | $ hg push -r . |
|
231 | $ hg push -r . | |
|
232 | IMPORTANT: if you use this extension, please contact | |||
|
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. | |||
112 | pushing to ssh://user@dummy/repo |
|
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. | |||
113 | searching for changes |
|
245 | searching for changes | |
114 | remote: adding changesets |
|
246 | remote: adding changesets | |
115 | remote: adding manifests |
|
247 | remote: adding manifests | |
116 | remote: adding file changes |
|
248 | remote: adding file changes | |
117 | remote: added 1 changesets with 1 changes to 1 files |
|
249 | remote: added 1 changesets with 1 changes to 1 files | |
118 | $ hg log -G -T '{desc} {phase} {bookmarks}' |
|
250 | $ 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. | |||
119 | @ newcommit public |
|
255 | @ newcommit public | |
120 | | |
|
256 | | | |
121 | | o scratchcommit draft scratch/mybranch |
|
257 | | o scratchcommit draft scratch/mybranch | |
@@ -126,14 +262,46 b' Push to non-scratch bookmark' | |||||
126 | Push to scratch branch |
|
262 | Push to scratch branch | |
127 | $ cd ../client2 |
|
263 | $ cd ../client2 | |
128 | $ hg up -q scratch/mybranch |
|
264 | $ 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. | |||
129 | $ mkcommit 'new scratch commit' |
|
269 | $ mkcommit 'new scratch commit' | |
|
270 | IMPORTANT: if you use this extension, please contact | |||
|
271 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
272 | unused and barring learning of users of this functionality, we drop this | |||
|
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. | |||
130 | $ hg push -r . -B scratch/mybranch |
|
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. | |||
131 | pushing to ssh://user@dummy/repo |
|
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. | |||
132 | searching for changes |
|
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. | |||
133 | remote: pushing 2 commits: |
|
297 | remote: pushing 2 commits: | |
134 | remote: 20759b6926ce scratchcommit |
|
298 | remote: 20759b6926ce scratchcommit | |
135 | remote: 1de1d7d92f89 new scratch commit |
|
299 | remote: 1de1d7d92f89 new scratch commit | |
136 | $ hg log -G -T '{desc} {phase} {bookmarks}' |
|
300 | $ 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. | |||
137 | @ new scratch commit draft scratch/mybranch |
|
305 | @ new scratch commit draft scratch/mybranch | |
138 | | |
|
306 | | | |
139 | o scratchcommit draft |
|
307 | o scratchcommit draft | |
@@ -149,12 +317,32 b' Push to scratch branch' | |||||
149 |
|
317 | |||
150 | Push scratch bookmark with no new revs |
|
318 | Push scratch bookmark with no new revs | |
151 | $ hg push -r . -B scratch/anotherbranch |
|
319 | $ hg push -r . -B scratch/anotherbranch | |
|
320 | IMPORTANT: if you use this extension, please contact | |||
|
321 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
322 | unused and barring learning of users of this functionality, we drop this | |||
|
323 | extension in Mercurial 6.6. | |||
152 | pushing to ssh://user@dummy/repo |
|
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. | |||
153 | searching for changes |
|
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. | |||
154 | remote: pushing 2 commits: |
|
338 | remote: pushing 2 commits: | |
155 | remote: 20759b6926ce scratchcommit |
|
339 | remote: 20759b6926ce scratchcommit | |
156 | remote: 1de1d7d92f89 new scratch commit |
|
340 | remote: 1de1d7d92f89 new scratch commit | |
157 | $ hg log -G -T '{desc} {phase} {bookmarks}' |
|
341 | $ 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. | |||
158 | @ new scratch commit draft scratch/anotherbranch scratch/mybranch |
|
346 | @ new scratch commit draft scratch/anotherbranch scratch/mybranch | |
159 | | |
|
347 | | | |
160 | o scratchcommit draft |
|
348 | o scratchcommit draft | |
@@ -168,10 +356,38 b' Push scratch bookmark with no new revs' | |||||
168 | Pull scratch and non-scratch bookmark at the same time |
|
356 | Pull scratch and non-scratch bookmark at the same time | |
169 |
|
357 | |||
170 | $ hg -R ../repo book newbook |
|
358 | $ 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. | |||
171 | $ cd ../client |
|
363 | $ cd ../client | |
172 | $ hg pull -B newbook -B scratch/mybranch --traceback |
|
364 | $ 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. | |||
173 | pulling from ssh://user@dummy/repo |
|
377 | pulling from ssh://user@dummy/repo | |
|
378 | remote: IMPORTANT: if you use this extension, please contact | |||
|
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. | |||
174 | searching for changes |
|
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. | |||
175 | adding changesets |
|
391 | adding changesets | |
176 | adding manifests |
|
392 | adding manifests | |
177 | adding file changes |
|
393 | adding file changes | |
@@ -180,6 +396,10 b' Pull scratch and non-scratch bookmark at' | |||||
180 | new changesets 1de1d7d92f89 (1 drafts) |
|
396 | new changesets 1de1d7d92f89 (1 drafts) | |
181 | (run 'hg update' to get a working copy) |
|
397 | (run 'hg update' to get a working copy) | |
182 | $ hg log -G -T '{desc} {phase} {bookmarks}' |
|
398 | $ 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. | |||
183 | o new scratch commit draft scratch/mybranch |
|
403 | o new scratch commit draft scratch/mybranch | |
184 | | |
|
404 | | | |
185 | | @ newcommit public |
|
405 | | @ newcommit public | |
@@ -192,8 +412,24 b' Pull scratch and non-scratch bookmark at' | |||||
192 | Push scratch revision without bookmark with --bundle-store |
|
412 | Push scratch revision without bookmark with --bundle-store | |
193 |
|
413 | |||
194 | $ hg up -q tip |
|
414 | $ 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. | |||
195 | $ mkcommit scratchcommitnobook |
|
419 | $ mkcommit scratchcommitnobook | |
|
420 | IMPORTANT: if you use this extension, please contact | |||
|
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. | |||
196 | $ hg log -G -T '{desc} {phase} {bookmarks}' |
|
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. | |||
197 | @ scratchcommitnobook draft |
|
433 | @ scratchcommitnobook draft | |
198 | | |
|
434 | | | |
199 | o new scratch commit draft scratch/mybranch |
|
435 | o new scratch commit draft scratch/mybranch | |
@@ -205,13 +441,33 b' Push scratch revision without bookmark w' | |||||
205 | o initialcommit public |
|
441 | o initialcommit public | |
206 |
|
442 | |||
207 | $ hg push -r . --bundle-store |
|
443 | $ hg push -r . --bundle-store | |
|
444 | IMPORTANT: if you use this extension, please contact | |||
|
445 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
446 | unused and barring learning of users of this functionality, we drop this | |||
|
447 | extension in Mercurial 6.6. | |||
208 | pushing to ssh://user@dummy/repo |
|
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. | |||
209 | searching for changes |
|
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. | |||
210 | remote: pushing 3 commits: |
|
462 | remote: pushing 3 commits: | |
211 | remote: 20759b6926ce scratchcommit |
|
463 | remote: 20759b6926ce scratchcommit | |
212 | remote: 1de1d7d92f89 new scratch commit |
|
464 | remote: 1de1d7d92f89 new scratch commit | |
213 | remote: 2b5d271c7e0d scratchcommitnobook |
|
465 | remote: 2b5d271c7e0d scratchcommitnobook | |
214 | $ hg -R ../repo log -G -T '{desc} {phase}' |
|
466 | $ 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. | |||
215 | o newcommit public |
|
471 | o newcommit public | |
216 | | |
|
472 | | | |
217 | o initialcommit public |
|
473 | o initialcommit public | |
@@ -224,15 +480,43 b' Push scratch revision without bookmark w' | |||||
224 |
|
480 | |||
225 | Test with pushrebase |
|
481 | Test with pushrebase | |
226 | $ mkcommit scratchcommitwithpushrebase |
|
482 | $ mkcommit scratchcommitwithpushrebase | |
|
483 | IMPORTANT: if you use this extension, please contact | |||
|
484 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
485 | unused and barring learning of users of this functionality, we drop this | |||
|
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. | |||
227 | $ hg push -r . -B scratch/mybranch |
|
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. | |||
228 | pushing to ssh://user@dummy/repo |
|
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. | |||
229 | searching for changes |
|
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. | |||
230 | remote: pushing 4 commits: |
|
510 | remote: pushing 4 commits: | |
231 | remote: 20759b6926ce scratchcommit |
|
511 | remote: 20759b6926ce scratchcommit | |
232 | remote: 1de1d7d92f89 new scratch commit |
|
512 | remote: 1de1d7d92f89 new scratch commit | |
233 | remote: 2b5d271c7e0d scratchcommitnobook |
|
513 | remote: 2b5d271c7e0d scratchcommitnobook | |
234 | remote: d8c4f54ab678 scratchcommitwithpushrebase |
|
514 | remote: d8c4f54ab678 scratchcommitwithpushrebase | |
235 | $ hg -R ../repo log -G -T '{desc} {phase}' |
|
515 | $ 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. | |||
236 | o newcommit public |
|
520 | o newcommit public | |
237 | | |
|
521 | | | |
238 | o initialcommit public |
|
522 | o initialcommit public | |
@@ -245,9 +529,33 b' Test with pushrebase' | |||||
245 |
|
529 | |||
246 | Change the order of pushrebase and infinitepush |
|
530 | Change the order of pushrebase and infinitepush | |
247 | $ mkcommit scratchcommitwithpushrebase2 |
|
531 | $ mkcommit scratchcommitwithpushrebase2 | |
|
532 | IMPORTANT: if you use this extension, please contact | |||
|
533 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
534 | unused and barring learning of users of this functionality, we drop this | |||
|
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. | |||
248 | $ hg push -r . -B scratch/mybranch |
|
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. | |||
249 | pushing to ssh://user@dummy/repo |
|
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. | |||
250 | searching for changes |
|
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. | |||
251 | remote: pushing 5 commits: |
|
559 | remote: pushing 5 commits: | |
252 | remote: 20759b6926ce scratchcommit |
|
560 | remote: 20759b6926ce scratchcommit | |
253 | remote: 1de1d7d92f89 new scratch commit |
|
561 | remote: 1de1d7d92f89 new scratch commit | |
@@ -255,6 +563,10 b' Change the order of pushrebase and infin' | |||||
255 | remote: d8c4f54ab678 scratchcommitwithpushrebase |
|
563 | remote: d8c4f54ab678 scratchcommitwithpushrebase | |
256 | remote: 6c10d49fe927 scratchcommitwithpushrebase2 |
|
564 | remote: 6c10d49fe927 scratchcommitwithpushrebase2 | |
257 | $ hg -R ../repo log -G -T '{desc} {phase}' |
|
565 | $ 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. | |||
258 | o newcommit public |
|
570 | o newcommit public | |
259 | | |
|
571 | | | |
260 | o initialcommit public |
|
572 | o initialcommit public | |
@@ -269,6 +581,10 b' Change the order of pushrebase and infin' | |||||
269 | Non-fastforward scratch bookmark push |
|
581 | Non-fastforward scratch bookmark push | |
270 |
|
582 | |||
271 | $ hg log -GT "{rev}:{node} {desc}\n" |
|
583 | $ 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. | |||
272 | @ 6:6c10d49fe92751666c40263f96721b918170d3da scratchcommitwithpushrebase2 |
|
588 | @ 6:6c10d49fe92751666c40263f96721b918170d3da scratchcommitwithpushrebase2 | |
273 | | |
|
589 | | | |
274 | o 5:d8c4f54ab678fd67cb90bb3f272a2dc6513a59a7 scratchcommitwithpushrebase |
|
590 | o 5:d8c4f54ab678fd67cb90bb3f272a2dc6513a59a7 scratchcommitwithpushrebase | |
@@ -284,12 +600,28 b' Non-fastforward scratch bookmark push' | |||||
284 | o 0:67145f4663446a9580364f70034fea6e21293b6f initialcommit |
|
600 | o 0:67145f4663446a9580364f70034fea6e21293b6f initialcommit | |
285 |
|
601 | |||
286 | $ hg up 6c10d49fe927 |
|
602 | $ 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. | |||
287 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
607 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
288 | $ echo 1 > amend |
|
608 | $ echo 1 > amend | |
289 | $ hg add amend |
|
609 | $ 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. | |||
290 | $ hg ci --amend -m 'scratch amended commit' |
|
614 | $ 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. | |||
291 | saved backup bundle to $TESTTMP/client/.hg/strip-backup/6c10d49fe927-c99ffec5-amend.hg |
|
619 | saved backup bundle to $TESTTMP/client/.hg/strip-backup/6c10d49fe927-c99ffec5-amend.hg | |
292 | $ hg log -G -T '{desc} {phase} {bookmarks}' |
|
620 | $ 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. | |||
293 | @ scratch amended commit draft scratch/mybranch |
|
625 | @ scratch amended commit draft scratch/mybranch | |
294 | | |
|
626 | | | |
295 | o scratchcommitwithpushrebase draft |
|
627 | o scratchcommitwithpushrebase draft | |
@@ -309,8 +641,24 b' Non-fastforward scratch bookmark push' | |||||
309 | scratch/anotherbranch 1de1d7d92f8965260391d0513fe8a8d5973d3042 |
|
641 | scratch/anotherbranch 1de1d7d92f8965260391d0513fe8a8d5973d3042 | |
310 | scratch/mybranch 6c10d49fe92751666c40263f96721b918170d3da |
|
642 | scratch/mybranch 6c10d49fe92751666c40263f96721b918170d3da | |
311 | $ hg push -r . -B scratch/mybranch |
|
643 | $ hg push -r . -B scratch/mybranch | |
|
644 | IMPORTANT: if you use this extension, please contact | |||
|
645 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
646 | unused and barring learning of users of this functionality, we drop this | |||
|
647 | extension in Mercurial 6.6. | |||
312 | pushing to ssh://user@dummy/repo |
|
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. | |||
313 | searching for changes |
|
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. | |||
314 | remote: pushing 5 commits: |
|
662 | remote: pushing 5 commits: | |
315 | remote: 20759b6926ce scratchcommit |
|
663 | remote: 20759b6926ce scratchcommit | |
316 | remote: 1de1d7d92f89 new scratch commit |
|
664 | remote: 1de1d7d92f89 new scratch commit | |
@@ -321,6 +669,10 b' Non-fastforward scratch bookmark push' | |||||
321 | scratch/anotherbranch 1de1d7d92f8965260391d0513fe8a8d5973d3042 |
|
669 | scratch/anotherbranch 1de1d7d92f8965260391d0513fe8a8d5973d3042 | |
322 | scratch/mybranch 8872775dd97a750e1533dc1fbbca665644b32547 |
|
670 | scratch/mybranch 8872775dd97a750e1533dc1fbbca665644b32547 | |
323 | $ hg log -G -T '{desc} {phase} {bookmarks}' |
|
671 | $ 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. | |||
324 | @ scratch amended commit draft scratch/mybranch |
|
676 | @ scratch amended commit draft scratch/mybranch | |
325 | | |
|
677 | | | |
326 | o scratchcommitwithpushrebase draft |
|
678 | o scratchcommitwithpushrebase draft | |
@@ -343,22 +695,54 b' Check that push path is not ignored. Add' | |||||
343 |
|
695 | |||
344 | Checkout last non-scrath commit |
|
696 | Checkout last non-scrath commit | |
345 | $ hg up 91894e11e8255 |
|
697 | $ 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. | |||
346 | 1 files updated, 0 files merged, 6 files removed, 0 files unresolved |
|
702 | 1 files updated, 0 files merged, 6 files removed, 0 files unresolved | |
347 | $ mkcommit peercommit |
|
703 | $ 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. | |||
348 | Use --force because this push creates new head |
|
712 | Use --force because this push creates new head | |
349 | $ hg push peer -r . -f |
|
713 | $ 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. | |||
350 | pushing to ssh://user@dummy/client2 |
|
718 | 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. | |||
351 | searching for changes |
|
727 | searching for changes | |
352 | remote: adding changesets |
|
728 | remote: adding changesets | |
353 | remote: adding manifests |
|
729 | remote: adding manifests | |
354 | remote: adding file changes |
|
730 | remote: adding file changes | |
355 | remote: added 2 changesets with 2 changes to 2 files (+1 heads) |
|
731 | remote: added 2 changesets with 2 changes to 2 files (+1 heads) | |
356 | $ hg -R ../repo log -G -T '{desc} {phase} {bookmarks}' |
|
732 | $ 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. | |||
357 | o newcommit public |
|
737 | o newcommit public | |
358 | | |
|
738 | | | |
359 | o initialcommit public |
|
739 | o initialcommit public | |
360 |
|
740 | |||
361 | $ hg -R ../client2 log -G -T '{desc} {phase} {bookmarks}' |
|
741 | $ 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. | |||
362 | o peercommit public |
|
746 | o peercommit public | |
363 | | |
|
747 | | | |
364 | o newcommit public |
|
748 | o newcommit public |
@@ -19,14 +19,40 b' Setup' | |||||
19 | $ echo "pushtobundlestore = True" >> .hg/hgrc |
|
19 | $ echo "pushtobundlestore = True" >> .hg/hgrc | |
20 | $ echo "[extensions]" >> .hg/hgrc |
|
20 | $ echo "[extensions]" >> .hg/hgrc | |
21 | $ echo "infinitepush=" >> .hg/hgrc |
|
21 | $ echo "infinitepush=" >> .hg/hgrc | |
|
22 | $ echo "[infinitepush]" >> .hg/hgrc | |||
|
23 | $ echo "deprecation-abort=no" >> .hg/hgrc | |||
22 | $ echo initialcommit > initialcommit |
|
24 | $ echo initialcommit > initialcommit | |
23 | $ hg ci -Aqm "initialcommit" |
|
25 | $ hg ci -Aqm "initialcommit" | |
|
26 | IMPORTANT: if you use this extension, please contact | |||
|
27 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
28 | unused and barring learning of users of this functionality, we drop this | |||
|
29 | extension in Mercurial 6.6. | |||
|
30 | IMPORTANT: if you use this extension, please contact (chg !) | |||
|
31 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be (chg !) | |||
|
32 | unused and barring learning of users of this functionality, we drop this (chg !) | |||
|
33 | extension in Mercurial 6.6. (chg !) | |||
24 |
$ |
|
34 | $ hg phase --public . | |
|
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. | |||
25 |
|
39 | |||
26 | $ cd .. |
|
40 | $ cd .. | |
27 | $ hg clone repo client -q |
|
41 | $ hg clone repo client -q | |
|
42 | IMPORTANT: if you use this extension, please contact | |||
|
43 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
44 | unused and barring learning of users of this functionality, we drop this | |||
|
45 | extension in Mercurial 6.6. | |||
28 | $ hg clone repo client2 -q |
|
46 | $ hg clone repo client2 -q | |
|
47 | IMPORTANT: if you use this extension, please contact | |||
|
48 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
49 | unused and barring learning of users of this functionality, we drop this | |||
|
50 | extension in Mercurial 6.6. | |||
29 | $ hg clone ssh://user@dummy/repo client3 -q |
|
51 | $ hg clone ssh://user@dummy/repo client3 -q | |
|
52 | remote: IMPORTANT: if you use this extension, please contact | |||
|
53 | remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
54 | remote: unused and barring learning of users of this functionality, we drop this | |||
|
55 | remote: extension in Mercurial 6.6. | |||
30 | $ cd client |
|
56 | $ cd client | |
31 |
|
57 | |||
32 | Pushing a new commit from the client to the server |
|
58 | Pushing a new commit from the client to the server | |
@@ -42,8 +68,16 b' Pushing a new commit from the client to ' | |||||
42 |
|
68 | |||
43 | $ hg push |
|
69 | $ hg push | |
44 | pushing to $TESTTMP/repo |
|
70 | pushing to $TESTTMP/repo | |
|
71 | IMPORTANT: if you use this extension, please contact | |||
|
72 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
73 | unused and barring learning of users of this functionality, we drop this | |||
|
74 | extension in Mercurial 6.6. | |||
45 | searching for changes |
|
75 | searching for changes | |
46 | storing changesets on the bundlestore |
|
76 | storing changesets on the bundlestore | |
|
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. | |||
47 | pushing 1 commit: |
|
81 | pushing 1 commit: | |
48 | 6cb0989601f1 added a |
|
82 | 6cb0989601f1 added a | |
49 |
|
83 | |||
@@ -74,6 +108,10 b' Checking that the commit was not applied' | |||||
74 | ------------------------------------------------------------------ |
|
108 | ------------------------------------------------------------------ | |
75 |
|
109 | |||
76 | $ hg glog |
|
110 | $ hg glog | |
|
111 | IMPORTANT: if you use this extension, please contact | |||
|
112 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
113 | unused and barring learning of users of this functionality, we drop this | |||
|
114 | extension in Mercurial 6.6. | |||
77 | @ 0:67145f466344 initialcommit |
|
115 | @ 0:67145f466344 initialcommit | |
78 | public |
|
116 | public | |
79 |
|
117 | |||
@@ -81,6 +119,10 b' Applying the changeset from the bundlest' | |||||
81 | -------------------------------------------- |
|
119 | -------------------------------------------- | |
82 |
|
120 | |||
83 | $ hg unbundle .hg/scratchbranches/filebundlestore/3b/41/3b414252ff8acab801318445d88ff48faf4a28c3 |
|
121 | $ hg unbundle .hg/scratchbranches/filebundlestore/3b/41/3b414252ff8acab801318445d88ff48faf4a28c3 | |
|
122 | IMPORTANT: if you use this extension, please contact | |||
|
123 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
124 | unused and barring learning of users of this functionality, we drop this | |||
|
125 | extension in Mercurial 6.6. | |||
84 | adding changesets |
|
126 | adding changesets | |
85 | adding manifests |
|
127 | adding manifests | |
86 | adding file changes |
|
128 | adding file changes | |
@@ -89,6 +131,10 b' Applying the changeset from the bundlest' | |||||
89 | (run 'hg update' to get a working copy) |
|
131 | (run 'hg update' to get a working copy) | |
90 |
|
132 | |||
91 | $ hg glog |
|
133 | $ hg glog | |
|
134 | IMPORTANT: if you use this extension, please contact | |||
|
135 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
136 | unused and barring learning of users of this functionality, we drop this | |||
|
137 | extension in Mercurial 6.6. | |||
92 | o 1:6cb0989601f1 added a |
|
138 | o 1:6cb0989601f1 added a | |
93 | | public |
|
139 | | public | |
94 | @ 0:67145f466344 initialcommit |
|
140 | @ 0:67145f466344 initialcommit | |
@@ -114,8 +160,16 b' Pushing more changesets from the local r' | |||||
114 |
|
160 | |||
115 | $ hg push |
|
161 | $ hg push | |
116 | pushing to $TESTTMP/repo |
|
162 | pushing to $TESTTMP/repo | |
|
163 | IMPORTANT: if you use this extension, please contact | |||
|
164 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
165 | unused and barring learning of users of this functionality, we drop this | |||
|
166 | extension in Mercurial 6.6. | |||
117 | searching for changes |
|
167 | searching for changes | |
118 | storing changesets on the bundlestore |
|
168 | storing changesets on the bundlestore | |
|
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. | |||
119 | pushing 2 commits: |
|
173 | pushing 2 commits: | |
120 | eaba929e866c added b |
|
174 | eaba929e866c added b | |
121 | bf8a6e3011b3 added c |
|
175 | bf8a6e3011b3 added c | |
@@ -124,6 +178,10 b' Checking that changesets are not applied' | |||||
124 | ------------------------------------------------------ |
|
178 | ------------------------------------------------------ | |
125 |
|
179 | |||
126 | $ hg glog -R ../repo |
|
180 | $ hg glog -R ../repo | |
|
181 | IMPORTANT: if you use this extension, please contact | |||
|
182 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
183 | unused and barring learning of users of this functionality, we drop this | |||
|
184 | extension in Mercurial 6.6. | |||
127 | o 1:6cb0989601f1 added a |
|
185 | o 1:6cb0989601f1 added a | |
128 | | public |
|
186 | | public | |
129 | @ 0:67145f466344 initialcommit |
|
187 | @ 0:67145f466344 initialcommit | |
@@ -146,8 +204,16 b' Pushing more changesets to the server' | |||||
146 | XXX: we should have pushed only the parts which are not in bundlestore |
|
204 | XXX: we should have pushed only the parts which are not in bundlestore | |
147 | $ hg push |
|
205 | $ hg push | |
148 | pushing to $TESTTMP/repo |
|
206 | pushing to $TESTTMP/repo | |
|
207 | IMPORTANT: if you use this extension, please contact | |||
|
208 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
209 | unused and barring learning of users of this functionality, we drop this | |||
|
210 | extension in Mercurial 6.6. | |||
149 | searching for changes |
|
211 | searching for changes | |
150 | storing changesets on the bundlestore |
|
212 | storing changesets on the bundlestore | |
|
213 | IMPORTANT: if you use this extension, please contact | |||
|
214 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
215 | unused and barring learning of users of this functionality, we drop this | |||
|
216 | extension in Mercurial 6.6. | |||
151 | pushing 4 commits: |
|
217 | pushing 4 commits: | |
152 | eaba929e866c added b |
|
218 | eaba929e866c added b | |
153 | bf8a6e3011b3 added c |
|
219 | bf8a6e3011b3 added c | |
@@ -166,6 +232,10 b' Checking if `hg pull` pulls something or' | |||||
166 | ----------------------------------------------------------------------- |
|
232 | ----------------------------------------------------------------------- | |
167 |
|
233 | |||
168 | $ hg incoming |
|
234 | $ hg incoming | |
|
235 | IMPORTANT: if you use this extension, please contact | |||
|
236 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
237 | unused and barring learning of users of this functionality, we drop this | |||
|
238 | extension in Mercurial 6.6. | |||
169 | comparing with $TESTTMP/repo |
|
239 | comparing with $TESTTMP/repo | |
170 | searching for changes |
|
240 | searching for changes | |
171 | no changes found |
|
241 | no changes found | |
@@ -173,6 +243,10 b' Checking if `hg pull` pulls something or' | |||||
173 |
|
243 | |||
174 | $ hg pull |
|
244 | $ hg pull | |
175 | pulling from $TESTTMP/repo |
|
245 | pulling from $TESTTMP/repo | |
|
246 | IMPORTANT: if you use this extension, please contact | |||
|
247 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
248 | unused and barring learning of users of this functionality, we drop this | |||
|
249 | extension in Mercurial 6.6. | |||
176 | searching for changes |
|
250 | searching for changes | |
177 | no changes found |
|
251 | no changes found | |
178 |
|
252 | |||
@@ -184,6 +258,10 b' Pulling the revision which is applied' | |||||
184 | $ cd ../client2 |
|
258 | $ cd ../client2 | |
185 | $ hg pull -r 6cb0989601f1 |
|
259 | $ hg pull -r 6cb0989601f1 | |
186 | pulling from $TESTTMP/repo |
|
260 | pulling from $TESTTMP/repo | |
|
261 | IMPORTANT: if you use this extension, please contact | |||
|
262 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
263 | unused and barring learning of users of this functionality, we drop this | |||
|
264 | extension in Mercurial 6.6. | |||
187 | searching for changes |
|
265 | searching for changes | |
188 | adding changesets |
|
266 | adding changesets | |
189 | adding manifests |
|
267 | adding manifests | |
@@ -203,6 +281,10 b' client side wrapping' | |||||
203 |
|
281 | |||
204 | $ hg pull -r b4e4bce660512ad3e71189e14588a70ac8e31fef |
|
282 | $ hg pull -r b4e4bce660512ad3e71189e14588a70ac8e31fef | |
205 | pulling from $TESTTMP/repo |
|
283 | pulling from $TESTTMP/repo | |
|
284 | IMPORTANT: if you use this extension, please contact | |||
|
285 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
286 | unused and barring learning of users of this functionality, we drop this | |||
|
287 | extension in Mercurial 6.6. | |||
206 | abort: unknown revision 'b4e4bce660512ad3e71189e14588a70ac8e31fef' |
|
288 | abort: unknown revision 'b4e4bce660512ad3e71189e14588a70ac8e31fef' | |
207 | [10] |
|
289 | [10] | |
208 | $ hg glog |
|
290 | $ hg glog | |
@@ -221,6 +303,10 b' Pulling the revision which is applied' | |||||
221 | $ cd ../client3 |
|
303 | $ cd ../client3 | |
222 | $ hg pull -r 6cb0989601f1 |
|
304 | $ hg pull -r 6cb0989601f1 | |
223 | pulling from ssh://user@dummy/repo |
|
305 | pulling from ssh://user@dummy/repo | |
|
306 | remote: IMPORTANT: if you use this extension, please contact | |||
|
307 | remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
308 | remote: unused and barring learning of users of this functionality, we drop this | |||
|
309 | remote: extension in Mercurial 6.6. | |||
224 | searching for changes |
|
310 | searching for changes | |
225 | adding changesets |
|
311 | adding changesets | |
226 | adding manifests |
|
312 | adding manifests | |
@@ -240,13 +326,25 b' Trying to specify short hash' | |||||
240 | XXX: we should support this |
|
326 | XXX: we should support this | |
241 | $ hg pull -r b4e4bce660512 |
|
327 | $ hg pull -r b4e4bce660512 | |
242 | pulling from ssh://user@dummy/repo |
|
328 | pulling from ssh://user@dummy/repo | |
|
329 | remote: IMPORTANT: if you use this extension, please contact | |||
|
330 | remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
331 | remote: unused and barring learning of users of this functionality, we drop this | |||
|
332 | remote: extension in Mercurial 6.6. | |||
243 | abort: unknown revision 'b4e4bce660512' |
|
333 | abort: unknown revision 'b4e4bce660512' | |
244 | [255] |
|
334 | [255] | |
245 |
|
335 | |||
246 | XXX: we should show better message when the pull is happening from bundlestore |
|
336 | XXX: we should show better message when the pull is happening from bundlestore | |
247 | $ hg pull -r b4e4bce660512ad3e71189e14588a70ac8e31fef |
|
337 | $ hg pull -r b4e4bce660512ad3e71189e14588a70ac8e31fef | |
248 | pulling from ssh://user@dummy/repo |
|
338 | pulling from ssh://user@dummy/repo | |
|
339 | remote: IMPORTANT: if you use this extension, please contact | |||
|
340 | remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
341 | remote: unused and barring learning of users of this functionality, we drop this | |||
|
342 | remote: extension in Mercurial 6.6. | |||
249 | searching for changes |
|
343 | searching for changes | |
|
344 | remote: IMPORTANT: if you use this extension, please contact | |||
|
345 | remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
346 | remote: unused and barring learning of users of this functionality, we drop this | |||
|
347 | remote: extension in Mercurial 6.6. | |||
250 | adding changesets |
|
348 | adding changesets | |
251 | adding manifests |
|
349 | adding manifests | |
252 | adding file changes |
|
350 | adding file changes | |
@@ -288,8 +386,16 b' creating a draft commit' | |||||
288 |
|
386 | |||
289 | $ hg push |
|
387 | $ hg push | |
290 | pushing to $TESTTMP/repo |
|
388 | pushing to $TESTTMP/repo | |
|
389 | IMPORTANT: if you use this extension, please contact | |||
|
390 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
391 | unused and barring learning of users of this functionality, we drop this | |||
|
392 | extension in Mercurial 6.6. | |||
291 | searching for changes |
|
393 | searching for changes | |
292 | storing changesets on the bundlestore |
|
394 | storing changesets on the bundlestore | |
|
395 | IMPORTANT: if you use this extension, please contact | |||
|
396 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
397 | unused and barring learning of users of this functionality, we drop this | |||
|
398 | extension in Mercurial 6.6. | |||
293 | pushing 5 commits: |
|
399 | pushing 5 commits: | |
294 | eaba929e866c added b |
|
400 | eaba929e866c added b | |
295 | bf8a6e3011b3 added c |
|
401 | bf8a6e3011b3 added c | |
@@ -315,6 +421,10 b' applying the bundle on the server to che' | |||||
315 | eaba929e866c59bc9a6aada5a9dd2f6990db83c0 280a46a259a268f0e740c81c5a7751bdbfaec85f |
|
421 | eaba929e866c59bc9a6aada5a9dd2f6990db83c0 280a46a259a268f0e740c81c5a7751bdbfaec85f | |
316 |
|
422 | |||
317 | $ hg unbundle .hg/scratchbranches/filebundlestore/28/0a/280a46a259a268f0e740c81c5a7751bdbfaec85f |
|
423 | $ hg unbundle .hg/scratchbranches/filebundlestore/28/0a/280a46a259a268f0e740c81c5a7751bdbfaec85f | |
|
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. | |||
318 | adding changesets |
|
428 | adding changesets | |
319 | adding manifests |
|
429 | adding manifests | |
320 | adding file changes |
|
430 | adding file changes | |
@@ -323,6 +433,10 b' applying the bundle on the server to che' | |||||
323 | (run 'hg update' to get a working copy) |
|
433 | (run 'hg update' to get a working copy) | |
324 |
|
434 | |||
325 | $ hg glog |
|
435 | $ hg glog | |
|
436 | IMPORTANT: if you use this extension, please contact | |||
|
437 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
438 | unused and barring learning of users of this functionality, we drop this | |||
|
439 | extension in Mercurial 6.6. | |||
326 | o 6:9b42578d4447 added f |
|
440 | o 6:9b42578d4447 added f | |
327 | | draft |
|
441 | | draft | |
328 | o 5:b4e4bce66051 added e |
|
442 | o 5:b4e4bce66051 added e | |
@@ -374,8 +488,16 b' enabling obsmarkers and rebase extension' | |||||
374 |
|
488 | |||
375 | $ hg push -f |
|
489 | $ hg push -f | |
376 | pushing to $TESTTMP/repo |
|
490 | pushing to $TESTTMP/repo | |
|
491 | IMPORTANT: if you use this extension, please contact | |||
|
492 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
493 | unused and barring learning of users of this functionality, we drop this | |||
|
494 | extension in Mercurial 6.6. | |||
377 | searching for changes |
|
495 | searching for changes | |
378 | storing changesets on the bundlestore |
|
496 | storing changesets on the bundlestore | |
|
497 | IMPORTANT: if you use this extension, please contact | |||
|
498 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
499 | unused and barring learning of users of this functionality, we drop this | |||
|
500 | extension in Mercurial 6.6. | |||
379 | pushing 1 commit: |
|
501 | pushing 1 commit: | |
380 | 99949238d9ac added f |
|
502 | 99949238d9ac added f | |
381 |
|
503 | |||
@@ -399,6 +521,14 b' Unbundling on server to see obsmarkers b' | |||||
399 | eaba929e866c59bc9a6aada5a9dd2f6990db83c0 280a46a259a268f0e740c81c5a7751bdbfaec85f |
|
521 | eaba929e866c59bc9a6aada5a9dd2f6990db83c0 280a46a259a268f0e740c81c5a7751bdbfaec85f | |
400 |
|
522 | |||
401 | $ hg glog |
|
523 | $ hg glog | |
|
524 | IMPORTANT: if you use this extension, please contact | |||
|
525 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
526 | unused and barring learning of users of this functionality, we drop this | |||
|
527 | extension in Mercurial 6.6. | |||
|
528 | IMPORTANT: if you use this extension, please contact (chg !) | |||
|
529 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be (chg !) | |||
|
530 | unused and barring learning of users of this functionality, we drop this (chg !) | |||
|
531 | extension in Mercurial 6.6. (chg !) | |||
402 | o 6:9b42578d4447 added f |
|
532 | o 6:9b42578d4447 added f | |
403 | | draft |
|
533 | | draft | |
404 | o 5:b4e4bce66051 added e |
|
534 | o 5:b4e4bce66051 added e | |
@@ -415,6 +545,10 b' Unbundling on server to see obsmarkers b' | |||||
415 | public |
|
545 | public | |
416 |
|
546 | |||
417 | $ hg unbundle .hg/scratchbranches/filebundlestore/09/0a/090a24fe63f31d3b4bee714447f835c8c362ff57 |
|
547 | $ hg unbundle .hg/scratchbranches/filebundlestore/09/0a/090a24fe63f31d3b4bee714447f835c8c362ff57 | |
|
548 | IMPORTANT: if you use this extension, please contact | |||
|
549 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
550 | unused and barring learning of users of this functionality, we drop this | |||
|
551 | extension in Mercurial 6.6. | |||
418 | adding changesets |
|
552 | adding changesets | |
419 | adding manifests |
|
553 | adding manifests | |
420 | adding file changes |
|
554 | adding file changes | |
@@ -425,6 +559,10 b' Unbundling on server to see obsmarkers b' | |||||
425 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
559 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
426 |
|
560 | |||
427 | $ hg glog |
|
561 | $ hg glog | |
|
562 | IMPORTANT: if you use this extension, please contact | |||
|
563 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
564 | unused and barring learning of users of this functionality, we drop this | |||
|
565 | extension in Mercurial 6.6. | |||
428 | o 7:99949238d9ac added f |
|
566 | o 7:99949238d9ac added f | |
429 | | draft |
|
567 | | draft | |
430 | | o 5:b4e4bce66051 added e |
|
568 | | o 5:b4e4bce66051 added e |
@@ -13,35 +13,107 b' Setup' | |||||
13 | $ cp $HGRCPATH $TESTTMP/defaulthgrc |
|
13 | $ cp $HGRCPATH $TESTTMP/defaulthgrc | |
14 | $ setupcommon |
|
14 | $ setupcommon | |
15 | $ hg init repo |
|
15 | $ hg init repo | |
|
16 | IMPORTANT: if you use this extension, please contact | |||
|
17 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
18 | unused and barring learning of users of this functionality, we drop this | |||
|
19 | extension in Mercurial 6.6. | |||
16 | $ cd repo |
|
20 | $ cd repo | |
17 | $ setupserver |
|
21 | $ setupserver | |
18 | $ echo initialcommit > initialcommit |
|
22 | $ echo initialcommit > initialcommit | |
19 | $ hg ci -Aqm "initialcommit" |
|
23 | $ hg ci -Aqm "initialcommit" | |
|
24 | IMPORTANT: if you use this extension, please contact | |||
|
25 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
26 | unused and barring learning of users of this functionality, we drop this | |||
|
27 | extension in Mercurial 6.6. | |||
20 |
$ |
|
28 | $ hg phase --public . | |
|
29 | IMPORTANT: if you use this extension, please contact | |||
|
30 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
31 | unused and barring learning of users of this functionality, we drop this | |||
|
32 | extension in Mercurial 6.6. | |||
21 |
|
33 | |||
22 | $ cd .. |
|
34 | $ cd .. | |
23 | $ hg clone ssh://user@dummy/repo client -q |
|
35 | $ hg clone ssh://user@dummy/repo client -q | |
|
36 | remote: IMPORTANT: if you use this extension, please contact | |||
|
37 | remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
38 | remote: unused and barring learning of users of this functionality, we drop this | |||
|
39 | remote: extension in Mercurial 6.6. | |||
|
40 | IMPORTANT: if you use this extension, please contact | |||
|
41 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
42 | unused and barring learning of users of this functionality, we drop this | |||
|
43 | extension in Mercurial 6.6. | |||
|
44 | IMPORTANT: if you use this extension, please contact | |||
|
45 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
46 | unused and barring learning of users of this functionality, we drop this | |||
|
47 | extension in Mercurial 6.6. | |||
24 |
|
48 | |||
25 | Create two heads. Push first head alone, then two heads together. Make sure that |
|
49 | Create two heads. Push first head alone, then two heads together. Make sure that | |
26 | multihead push works. |
|
50 | multihead push works. | |
27 | $ cd client |
|
51 | $ cd client | |
28 | $ echo multihead1 > multihead1 |
|
52 | $ echo multihead1 > multihead1 | |
29 | $ hg add multihead1 |
|
53 | $ hg add multihead1 | |
|
54 | IMPORTANT: if you use this extension, please contact | |||
|
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. | |||
30 | $ hg ci -m "multihead1" |
|
58 | $ hg ci -m "multihead1" | |
|
59 | IMPORTANT: if you use this extension, please contact | |||
|
60 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
61 | unused and barring learning of users of this functionality, we drop this | |||
|
62 | extension in Mercurial 6.6. | |||
31 |
$ |
|
63 | $ hg up null | |
|
64 | IMPORTANT: if you use this extension, please contact | |||
|
65 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
66 | unused and barring learning of users of this functionality, we drop this | |||
|
67 | extension in Mercurial 6.6. | |||
32 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
68 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
33 | $ echo multihead2 > multihead2 |
|
69 | $ echo multihead2 > multihead2 | |
34 | $ hg ci -Am "multihead2" |
|
70 | $ hg ci -Am "multihead2" | |
|
71 | IMPORTANT: if you use this extension, please contact | |||
|
72 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
73 | unused and barring learning of users of this functionality, we drop this | |||
|
74 | extension in Mercurial 6.6. | |||
35 | adding multihead2 |
|
75 | adding multihead2 | |
36 | created new head |
|
76 | created new head | |
37 | $ hg push -r . --bundle-store |
|
77 | $ hg push -r . --bundle-store | |
|
78 | IMPORTANT: if you use this extension, please contact | |||
|
79 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
80 | unused and barring learning of users of this functionality, we drop this | |||
|
81 | extension in Mercurial 6.6. | |||
38 | pushing to ssh://user@dummy/repo |
|
82 | pushing to ssh://user@dummy/repo | |
|
83 | remote: IMPORTANT: if you use this extension, please contact | |||
|
84 | remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
85 | remote: unused and barring learning of users of this functionality, we drop this | |||
|
86 | remote: extension in Mercurial 6.6. | |||
|
87 | IMPORTANT: if you use this extension, please contact | |||
|
88 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
89 | unused and barring learning of users of this functionality, we drop this | |||
|
90 | extension in Mercurial 6.6. | |||
39 | searching for changes |
|
91 | searching for changes | |
|
92 | remote: IMPORTANT: if you use this extension, please contact | |||
|
93 | remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
94 | remote: unused and barring learning of users of this functionality, we drop this | |||
|
95 | remote: extension in Mercurial 6.6. | |||
40 | remote: pushing 1 commit: |
|
96 | remote: pushing 1 commit: | |
41 | remote: ee4802bf6864 multihead2 |
|
97 | remote: ee4802bf6864 multihead2 | |
42 | $ hg push -r '1:2' --bundle-store |
|
98 | $ hg push -r '1:2' --bundle-store | |
|
99 | IMPORTANT: if you use this extension, please contact | |||
|
100 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
101 | unused and barring learning of users of this functionality, we drop this | |||
|
102 | extension in Mercurial 6.6. | |||
43 | pushing to ssh://user@dummy/repo |
|
103 | pushing to ssh://user@dummy/repo | |
|
104 | remote: IMPORTANT: if you use this extension, please contact | |||
|
105 | remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
106 | remote: unused and barring learning of users of this functionality, we drop this | |||
|
107 | remote: extension in Mercurial 6.6. | |||
|
108 | IMPORTANT: if you use this extension, please contact | |||
|
109 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
110 | unused and barring learning of users of this functionality, we drop this | |||
|
111 | extension in Mercurial 6.6. | |||
44 | searching for changes |
|
112 | searching for changes | |
|
113 | remote: IMPORTANT: if you use this extension, please contact | |||
|
114 | remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
115 | remote: unused and barring learning of users of this functionality, we drop this | |||
|
116 | remote: extension in Mercurial 6.6. | |||
45 | remote: pushing 2 commits: |
|
117 | remote: pushing 2 commits: | |
46 | remote: bc22f9a30a82 multihead1 |
|
118 | remote: bc22f9a30a82 multihead1 | |
47 | remote: ee4802bf6864 multihead2 |
|
119 | remote: ee4802bf6864 multihead2 | |
@@ -51,35 +123,123 b' multihead push works.' | |||||
51 |
|
123 | |||
52 | Create two new scratch bookmarks |
|
124 | Create two new scratch bookmarks | |
53 | $ hg up 0 |
|
125 | $ hg up 0 | |
|
126 | IMPORTANT: if you use this extension, please contact | |||
|
127 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
128 | unused and barring learning of users of this functionality, we drop this | |||
|
129 | extension in Mercurial 6.6. | |||
54 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
130 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
55 | $ echo scratchfirstpart > scratchfirstpart |
|
131 | $ echo scratchfirstpart > scratchfirstpart | |
56 | $ hg ci -Am "scratchfirstpart" |
|
132 | $ hg ci -Am "scratchfirstpart" | |
|
133 | IMPORTANT: if you use this extension, please contact | |||
|
134 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
135 | unused and barring learning of users of this functionality, we drop this | |||
|
136 | extension in Mercurial 6.6. | |||
57 | adding scratchfirstpart |
|
137 | adding scratchfirstpart | |
58 | created new head |
|
138 | created new head | |
59 | $ hg push -r . -B scratch/firstpart |
|
139 | $ hg push -r . -B scratch/firstpart | |
|
140 | IMPORTANT: if you use this extension, please contact | |||
|
141 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
142 | unused and barring learning of users of this functionality, we drop this | |||
|
143 | extension in Mercurial 6.6. | |||
60 | pushing to ssh://user@dummy/repo |
|
144 | pushing to ssh://user@dummy/repo | |
|
145 | remote: IMPORTANT: if you use this extension, please contact | |||
|
146 | remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
147 | remote: unused and barring learning of users of this functionality, we drop this | |||
|
148 | remote: extension in Mercurial 6.6. | |||
|
149 | IMPORTANT: if you use this extension, please contact | |||
|
150 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
151 | unused and barring learning of users of this functionality, we drop this | |||
|
152 | extension in Mercurial 6.6. | |||
61 | searching for changes |
|
153 | searching for changes | |
|
154 | remote: IMPORTANT: if you use this extension, please contact | |||
|
155 | remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
156 | remote: unused and barring learning of users of this functionality, we drop this | |||
|
157 | remote: extension in Mercurial 6.6. | |||
62 | remote: pushing 1 commit: |
|
158 | remote: pushing 1 commit: | |
63 | remote: 176993b87e39 scratchfirstpart |
|
159 | remote: 176993b87e39 scratchfirstpart | |
64 | $ hg up 0 |
|
160 | $ hg up 0 | |
|
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. | |||
65 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
165 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
66 | $ echo scratchsecondpart > scratchsecondpart |
|
166 | $ echo scratchsecondpart > scratchsecondpart | |
67 | $ hg ci -Am "scratchsecondpart" |
|
167 | $ hg ci -Am "scratchsecondpart" | |
|
168 | IMPORTANT: if you use this extension, please contact | |||
|
169 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
170 | unused and barring learning of users of this functionality, we drop this | |||
|
171 | extension in Mercurial 6.6. | |||
68 | adding scratchsecondpart |
|
172 | adding scratchsecondpart | |
69 | created new head |
|
173 | created new head | |
70 | $ hg push -r . -B scratch/secondpart |
|
174 | $ hg push -r . -B scratch/secondpart | |
|
175 | IMPORTANT: if you use this extension, please contact | |||
|
176 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
177 | unused and barring learning of users of this functionality, we drop this | |||
|
178 | extension in Mercurial 6.6. | |||
71 | pushing to ssh://user@dummy/repo |
|
179 | pushing to ssh://user@dummy/repo | |
|
180 | remote: IMPORTANT: if you use this extension, please contact | |||
|
181 | remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
182 | remote: unused and barring learning of users of this functionality, we drop this | |||
|
183 | remote: extension in Mercurial 6.6. | |||
|
184 | IMPORTANT: if you use this extension, please contact | |||
|
185 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
186 | unused and barring learning of users of this functionality, we drop this | |||
|
187 | extension in Mercurial 6.6. | |||
72 | searching for changes |
|
188 | searching for changes | |
|
189 | remote: IMPORTANT: if you use this extension, please contact | |||
|
190 | remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
191 | remote: unused and barring learning of users of this functionality, we drop this | |||
|
192 | remote: extension in Mercurial 6.6. | |||
73 | remote: pushing 1 commit: |
|
193 | remote: pushing 1 commit: | |
74 | remote: 8db3891c220e scratchsecondpart |
|
194 | remote: 8db3891c220e scratchsecondpart | |
75 |
|
195 | |||
76 | Pull two bookmarks from the second client |
|
196 | Pull two bookmarks from the second client | |
77 | $ cd .. |
|
197 | $ cd .. | |
78 | $ hg clone ssh://user@dummy/repo client2 -q |
|
198 | $ hg clone ssh://user@dummy/repo client2 -q | |
|
199 | remote: IMPORTANT: if you use this extension, please contact | |||
|
200 | remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
201 | remote: unused and barring learning of users of this functionality, we drop this | |||
|
202 | remote: extension in Mercurial 6.6. | |||
|
203 | IMPORTANT: if you use this extension, please contact | |||
|
204 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
205 | unused and barring learning of users of this functionality, we drop this | |||
|
206 | extension in Mercurial 6.6. | |||
|
207 | IMPORTANT: if you use this extension, please contact | |||
|
208 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
209 | unused and barring learning of users of this functionality, we drop this | |||
|
210 | extension in Mercurial 6.6. | |||
79 |
$ |
|
211 | $ cd client2 | |
80 | $ hg pull -B scratch/firstpart -B scratch/secondpart |
|
212 | $ hg pull -B scratch/firstpart -B scratch/secondpart | |
|
213 | IMPORTANT: if you use this extension, please contact | |||
|
214 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
215 | unused and barring learning of users of this functionality, we drop this | |||
|
216 | extension in Mercurial 6.6. | |||
|
217 | remote: IMPORTANT: if you use this extension, please contact | |||
|
218 | remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
219 | remote: unused and barring learning of users of this functionality, we drop this | |||
|
220 | remote: extension in Mercurial 6.6. | |||
|
221 | IMPORTANT: if you use this extension, please contact | |||
|
222 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
223 | unused and barring learning of users of this functionality, we drop this | |||
|
224 | extension in Mercurial 6.6. | |||
81 | pulling from ssh://user@dummy/repo |
|
225 | pulling from ssh://user@dummy/repo | |
|
226 | remote: IMPORTANT: if you use this extension, please contact | |||
|
227 | remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
228 | remote: unused and barring learning of users of this functionality, we drop this | |||
|
229 | remote: extension in Mercurial 6.6. | |||
|
230 | IMPORTANT: if you use this extension, please contact | |||
|
231 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
232 | unused and barring learning of users of this functionality, we drop this | |||
|
233 | extension in Mercurial 6.6. | |||
82 | searching for changes |
|
234 | searching for changes | |
|
235 | remote: IMPORTANT: if you use this extension, please contact | |||
|
236 | remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
237 | remote: unused and barring learning of users of this functionality, we drop this | |||
|
238 | remote: extension in Mercurial 6.6. | |||
|
239 | remote: IMPORTANT: if you use this extension, please contact | |||
|
240 | remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
241 | remote: unused and barring learning of users of this functionality, we drop this | |||
|
242 | remote: extension in Mercurial 6.6. | |||
83 | adding changesets |
|
243 | adding changesets | |
84 | adding manifests |
|
244 | adding manifests | |
85 | adding file changes |
|
245 | adding file changes | |
@@ -90,28 +250,88 b' Pull two bookmarks from the second clien' | |||||
90 | new changesets * (glob) |
|
250 | new changesets * (glob) | |
91 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
251 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
92 | $ hg log -r scratch/secondpart -T '{node}' |
|
252 | $ hg log -r scratch/secondpart -T '{node}' | |
|
253 | IMPORTANT: if you use this extension, please contact | |||
|
254 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
255 | unused and barring learning of users of this functionality, we drop this | |||
|
256 | extension in Mercurial 6.6. | |||
93 | 8db3891c220e216f6da214e8254bd4371f55efca (no-eol) |
|
257 | 8db3891c220e216f6da214e8254bd4371f55efca (no-eol) | |
94 | $ hg log -r scratch/firstpart -T '{node}' |
|
258 | $ hg log -r scratch/firstpart -T '{node}' | |
|
259 | IMPORTANT: if you use this extension, please contact | |||
|
260 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
261 | unused and barring learning of users of this functionality, we drop this | |||
|
262 | extension in Mercurial 6.6. | |||
95 | 176993b87e39bd88d66a2cccadabe33f0b346339 (no-eol) |
|
263 | 176993b87e39bd88d66a2cccadabe33f0b346339 (no-eol) | |
96 | Make two commits to the scratch branch |
|
264 | Make two commits to the scratch branch | |
97 |
|
265 | |||
98 | $ echo testpullbycommithash1 > testpullbycommithash1 |
|
266 | $ echo testpullbycommithash1 > testpullbycommithash1 | |
99 | $ hg ci -Am "testpullbycommithash1" |
|
267 | $ hg ci -Am "testpullbycommithash1" | |
|
268 | IMPORTANT: if you use this extension, please contact | |||
|
269 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
270 | unused and barring learning of users of this functionality, we drop this | |||
|
271 | extension in Mercurial 6.6. | |||
100 | adding testpullbycommithash1 |
|
272 | adding testpullbycommithash1 | |
101 | created new head |
|
273 | created new head | |
102 | $ hg log -r '.' -T '{node}\n' > ../testpullbycommithash1 |
|
274 | $ hg log -r '.' -T '{node}\n' > ../testpullbycommithash1 | |
|
275 | IMPORTANT: if you use this extension, please contact | |||
|
276 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
277 | unused and barring learning of users of this functionality, we drop this | |||
|
278 | extension in Mercurial 6.6. | |||
103 |
$ |
|
279 | $ echo testpullbycommithash2 > testpullbycommithash2 | |
104 | $ hg ci -Aqm "testpullbycommithash2" |
|
280 | $ hg ci -Aqm "testpullbycommithash2" | |
|
281 | IMPORTANT: if you use this extension, please contact | |||
|
282 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
283 | unused and barring learning of users of this functionality, we drop this | |||
|
284 | extension in Mercurial 6.6. | |||
105 |
$ |
|
285 | $ hg push -r . -B scratch/mybranch -q | |
|
286 | IMPORTANT: if you use this extension, please contact | |||
|
287 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
288 | unused and barring learning of users of this functionality, we drop this | |||
|
289 | extension in Mercurial 6.6. | |||
|
290 | remote: IMPORTANT: if you use this extension, please contact | |||
|
291 | remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
292 | remote: unused and barring learning of users of this functionality, we drop this | |||
|
293 | remote: extension in Mercurial 6.6. | |||
|
294 | IMPORTANT: if you use this extension, please contact | |||
|
295 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
296 | unused and barring learning of users of this functionality, we drop this | |||
|
297 | extension in Mercurial 6.6. | |||
106 |
|
298 | |||
107 | Create third client and pull by commit hash. |
|
299 | Create third client and pull by commit hash. | |
108 | Make sure testpullbycommithash2 has not fetched |
|
300 | Make sure testpullbycommithash2 has not fetched | |
109 | $ cd .. |
|
301 | $ cd .. | |
110 | $ hg clone ssh://user@dummy/repo client3 -q |
|
302 | $ hg clone ssh://user@dummy/repo client3 -q | |
|
303 | remote: IMPORTANT: if you use this extension, please contact | |||
|
304 | remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
305 | remote: unused and barring learning of users of this functionality, we drop this | |||
|
306 | remote: extension in Mercurial 6.6. | |||
|
307 | IMPORTANT: if you use this extension, please contact | |||
|
308 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
309 | unused and barring learning of users of this functionality, we drop this | |||
|
310 | extension in Mercurial 6.6. | |||
|
311 | IMPORTANT: if you use this extension, please contact | |||
|
312 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
313 | unused and barring learning of users of this functionality, we drop this | |||
|
314 | extension in Mercurial 6.6. | |||
111 |
$ |
|
315 | $ cd client3 | |
112 | $ hg pull -r `cat ../testpullbycommithash1` |
|
316 | $ hg pull -r `cat ../testpullbycommithash1` | |
|
317 | IMPORTANT: if you use this extension, please contact | |||
|
318 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
319 | unused and barring learning of users of this functionality, we drop this | |||
|
320 | extension in Mercurial 6.6. | |||
113 | pulling from ssh://user@dummy/repo |
|
321 | pulling from ssh://user@dummy/repo | |
|
322 | remote: IMPORTANT: if you use this extension, please contact | |||
|
323 | remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
324 | remote: unused and barring learning of users of this functionality, we drop this | |||
|
325 | remote: extension in Mercurial 6.6. | |||
|
326 | IMPORTANT: if you use this extension, please contact | |||
|
327 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
328 | unused and barring learning of users of this functionality, we drop this | |||
|
329 | extension in Mercurial 6.6. | |||
114 | searching for changes |
|
330 | searching for changes | |
|
331 | remote: IMPORTANT: if you use this extension, please contact | |||
|
332 | remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
333 | remote: unused and barring learning of users of this functionality, we drop this | |||
|
334 | remote: extension in Mercurial 6.6. | |||
115 | adding changesets |
|
335 | adding changesets | |
116 | adding manifests |
|
336 | adding manifests | |
117 | adding file changes |
|
337 | adding file changes | |
@@ -119,6 +339,10 b' Make sure testpullbycommithash2 has not ' | |||||
119 | new changesets 33910bfe6ffe (1 drafts) |
|
339 | new changesets 33910bfe6ffe (1 drafts) | |
120 | (run 'hg update' to get a working copy) |
|
340 | (run 'hg update' to get a working copy) | |
121 | $ hg log -G -T '{desc} {phase} {bookmarks}' |
|
341 | $ 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. | |||
122 | o testpullbycommithash1 draft |
|
346 | o testpullbycommithash1 draft | |
123 | | |
|
347 | | | |
124 | @ initialcommit public |
|
348 | @ initialcommit public | |
@@ -128,10 +352,30 b' Make sure phase on the client is public.' | |||||
128 | $ cd ../repo |
|
352 | $ cd ../repo | |
129 | $ echo publiccommit > publiccommit |
|
353 | $ echo publiccommit > publiccommit | |
130 | $ hg ci -Aqm "publiccommit" |
|
354 | $ hg ci -Aqm "publiccommit" | |
|
355 | IMPORTANT: if you use this extension, please contact | |||
|
356 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
357 | unused and barring learning of users of this functionality, we drop this | |||
|
358 | extension in Mercurial 6.6. | |||
131 |
$ |
|
359 | $ hg phase --public . | |
|
360 | IMPORTANT: if you use this extension, please contact | |||
|
361 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
362 | unused and barring learning of users of this functionality, we drop this | |||
|
363 | extension in Mercurial 6.6. | |||
132 | $ cd ../client3 |
|
364 | $ cd ../client3 | |
133 | $ hg pull |
|
365 | $ hg pull | |
|
366 | IMPORTANT: if you use this extension, please contact | |||
|
367 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
368 | unused and barring learning of users of this functionality, we drop this | |||
|
369 | extension in Mercurial 6.6. | |||
134 | pulling from ssh://user@dummy/repo |
|
370 | pulling from ssh://user@dummy/repo | |
|
371 | remote: IMPORTANT: if you use this extension, please contact | |||
|
372 | remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
373 | remote: unused and barring learning of users of this functionality, we drop this | |||
|
374 | remote: extension in Mercurial 6.6. | |||
|
375 | IMPORTANT: if you use this extension, please contact | |||
|
376 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
377 | unused and barring learning of users of this functionality, we drop this | |||
|
378 | extension in Mercurial 6.6. | |||
135 | searching for changes |
|
379 | searching for changes | |
136 | adding changesets |
|
380 | adding changesets | |
137 | adding manifests |
|
381 | adding manifests | |
@@ -140,6 +384,10 b' Make sure phase on the client is public.' | |||||
140 | new changesets a79b6597f322 |
|
384 | new changesets a79b6597f322 | |
141 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
385 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
142 | $ hg log -G -T '{desc} {phase} {bookmarks} {node|short}' |
|
386 | $ hg log -G -T '{desc} {phase} {bookmarks} {node|short}' | |
|
387 | IMPORTANT: if you use this extension, please contact | |||
|
388 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
389 | unused and barring learning of users of this functionality, we drop this | |||
|
390 | extension in Mercurial 6.6. | |||
143 | o publiccommit public a79b6597f322 |
|
391 | o publiccommit public a79b6597f322 | |
144 | | |
|
392 | | | |
145 | | o testpullbycommithash1 draft 33910bfe6ffe |
|
393 | | o testpullbycommithash1 draft 33910bfe6ffe | |
@@ -147,18 +395,66 b' Make sure phase on the client is public.' | |||||
147 | @ initialcommit public 67145f466344 |
|
395 | @ initialcommit public 67145f466344 | |
148 |
|
396 | |||
149 | $ hg up a79b6597f322 |
|
397 | $ hg up a79b6597f322 | |
|
398 | IMPORTANT: if you use this extension, please contact | |||
|
399 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
400 | unused and barring learning of users of this functionality, we drop this | |||
|
401 | extension in Mercurial 6.6. | |||
150 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
402 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
151 | $ echo scratchontopofpublic > scratchontopofpublic |
|
403 | $ echo scratchontopofpublic > scratchontopofpublic | |
152 | $ hg ci -Aqm "scratchontopofpublic" |
|
404 | $ hg ci -Aqm "scratchontopofpublic" | |
|
405 | IMPORTANT: if you use this extension, please contact | |||
|
406 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
407 | unused and barring learning of users of this functionality, we drop this | |||
|
408 | extension in Mercurial 6.6. | |||
153 |
$ |
|
409 | $ hg push -r . -B scratch/scratchontopofpublic | |
|
410 | IMPORTANT: if you use this extension, please contact | |||
|
411 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
412 | unused and barring learning of users of this functionality, we drop this | |||
|
413 | extension in Mercurial 6.6. | |||
154 | pushing to ssh://user@dummy/repo |
|
414 | pushing to ssh://user@dummy/repo | |
|
415 | remote: IMPORTANT: if you use this extension, please contact | |||
|
416 | remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
417 | remote: unused and barring learning of users of this functionality, we drop this | |||
|
418 | remote: extension in Mercurial 6.6. | |||
|
419 | IMPORTANT: if you use this extension, please contact | |||
|
420 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
421 | unused and barring learning of users of this functionality, we drop this | |||
|
422 | extension in Mercurial 6.6. | |||
155 | searching for changes |
|
423 | searching for changes | |
|
424 | remote: IMPORTANT: if you use this extension, please contact | |||
|
425 | remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
426 | remote: unused and barring learning of users of this functionality, we drop this | |||
|
427 | remote: extension in Mercurial 6.6. | |||
156 | remote: pushing 1 commit: |
|
428 | remote: pushing 1 commit: | |
157 | remote: c70aee6da07d scratchontopofpublic |
|
429 | remote: c70aee6da07d scratchontopofpublic | |
158 | $ cd ../client2 |
|
430 | $ cd ../client2 | |
159 | $ hg pull -B scratch/scratchontopofpublic |
|
431 | $ hg pull -B scratch/scratchontopofpublic | |
|
432 | IMPORTANT: if you use this extension, please contact | |||
|
433 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
434 | unused and barring learning of users of this functionality, we drop this | |||
|
435 | extension in Mercurial 6.6. | |||
|
436 | remote: IMPORTANT: if you use this extension, please contact | |||
|
437 | remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
438 | remote: unused and barring learning of users of this functionality, we drop this | |||
|
439 | remote: extension in Mercurial 6.6. | |||
|
440 | IMPORTANT: if you use this extension, please contact | |||
|
441 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
442 | unused and barring learning of users of this functionality, we drop this | |||
|
443 | extension in Mercurial 6.6. | |||
160 | pulling from ssh://user@dummy/repo |
|
444 | pulling from ssh://user@dummy/repo | |
|
445 | remote: IMPORTANT: if you use this extension, please contact | |||
|
446 | remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
447 | remote: unused and barring learning of users of this functionality, we drop this | |||
|
448 | remote: extension in Mercurial 6.6. | |||
|
449 | IMPORTANT: if you use this extension, please contact | |||
|
450 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
451 | unused and barring learning of users of this functionality, we drop this | |||
|
452 | extension in Mercurial 6.6. | |||
161 | searching for changes |
|
453 | searching for changes | |
|
454 | remote: IMPORTANT: if you use this extension, please contact | |||
|
455 | remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
456 | remote: unused and barring learning of users of this functionality, we drop this | |||
|
457 | remote: extension in Mercurial 6.6. | |||
162 | adding changesets |
|
458 | adding changesets | |
163 | adding manifests |
|
459 | adding manifests | |
164 | adding file changes |
|
460 | adding file changes | |
@@ -169,4 +465,8 b' Make sure phase on the client is public.' | |||||
169 | new changesets a79b6597f322:c70aee6da07d (1 drafts) |
|
465 | new changesets a79b6597f322:c70aee6da07d (1 drafts) | |
170 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
466 | (run 'hg heads .' to see heads, 'hg merge' to merge) | |
171 | $ hg log -r scratch/scratchontopofpublic -T '{phase}' |
|
467 | $ hg log -r scratch/scratchontopofpublic -T '{phase}' | |
|
468 | IMPORTANT: if you use this extension, please contact | |||
|
469 | mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be | |||
|
470 | unused and barring learning of users of this functionality, we drop this | |||
|
471 | extension in Mercurial 6.6. | |||
172 | draft (no-eol) |
|
472 | draft (no-eol) |
General Comments 0
You need to be logged in to leave comments.
Login now