equal
deleted
inserted
replaced
2 > [web] |
2 > [web] |
3 > push_ssl = false |
3 > push_ssl = false |
4 > allow_push = * |
4 > allow_push = * |
5 > [phases] |
5 > [phases] |
6 > publish=False |
6 > publish=False |
|
7 > [obsolete] |
|
8 > secret-unstable=no |
7 > [extensions] |
9 > [extensions] |
8 > EOF |
10 > EOF |
9 $ echo "obsolete=$(echo $(dirname $TESTDIR))/hgext/obsolete.py" >> $HGRCPATH |
11 $ echo "obsolete=$(echo $(dirname $TESTDIR))/hgext/obsolete.py" >> $HGRCPATH |
10 $ mkcommit() { |
12 $ mkcommit() { |
11 > echo "$1" > "$1" |
13 > echo "$1" > "$1" |
15 |
17 |
16 $ alias qlog="hg log --template='{rev}\n- {node|short}\n'" |
18 $ alias qlog="hg log --template='{rev}\n- {node|short}\n'" |
17 $ hg init local |
19 $ hg init local |
18 $ cd local |
20 $ cd local |
19 $ mkcommit a # 0 |
21 $ mkcommit a # 0 |
20 $ hg pull -q . #hg published 0 |
22 $ hg phase -p . |
21 $ mkcommit b # 1 |
23 $ mkcommit b # 1 |
22 $ mkcommit c # 2 |
24 $ mkcommit c # 2 |
23 $ hg up 1 |
25 $ hg up 1 |
24 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
26 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
25 $ mkcommit obsol_c # 3 |
27 $ mkcommit obsol_c # 3 |
74 - 0d3f46688ccc |
76 - 0d3f46688ccc |
75 |
77 |
76 Test communication of obsolete relation with a compatible client |
78 Test communication of obsolete relation with a compatible client |
77 |
79 |
78 $ hg init ../other-new |
80 $ hg init ../other-new |
|
81 $ hg phase --draft 'secret() - extinct()' # until we fix exclusion |
79 $ hg push --traceback ../other-new |
82 $ hg push --traceback ../other-new |
80 pushing to ../other-new |
83 pushing to ../other-new |
81 searching for changes |
84 searching for changes |
82 adding changesets |
85 adding changesets |
83 adding manifests |
86 adding manifests |
146 pulling from . |
149 pulling from . |
147 searching for changes |
150 searching for changes |
148 adding changesets |
151 adding changesets |
149 adding manifests |
152 adding manifests |
150 adding file changes |
153 adding file changes |
151 added 2 changesets with 2 changes to 2 files (+2 heads) |
154 added 1 changesets with 1 changes to 1 files (+1 heads) |
152 (run 'hg heads .' to see heads, 'hg merge' to merge) |
155 (run 'hg heads .' to see heads, 'hg merge' to merge) |
153 $ qlog -R ../other-new |
156 $ qlog -R ../other-new |
154 7 |
157 6 |
155 - 909a0fb57e5d |
158 - 909a0fb57e5d |
156 3 |
159 3 |
157 - 725c380fe99b |
160 - 725c380fe99b |
158 2 |
161 2 |
159 - 0d3f46688ccc |
162 - 0d3f46688ccc |
194 > # The warning should go away once we have default value to set ready before we pull |
197 > # The warning should go away once we have default value to set ready before we pull |
195 requesting all changes |
198 requesting all changes |
196 adding changesets |
199 adding changesets |
197 adding manifests |
200 adding manifests |
198 adding file changes |
201 adding file changes |
199 added 8 changesets with 8 changes to 8 files (+4 heads) |
202 added 5 changesets with 5 changes to 5 files (+1 heads) |
200 updating to branch default |
203 updating to branch default |
201 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
204 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
202 |
205 |
203 $ qlog -R ../cloned |
206 $ qlog -R ../cloned |
204 7 |
207 4 |
205 - 909a0fb57e5d |
208 - 909a0fb57e5d |
206 4 |
209 3 |
207 - 725c380fe99b |
210 - 725c380fe99b |
208 3 |
211 2 |
209 - 0d3f46688ccc |
212 - 0d3f46688ccc |
210 1 |
213 1 |
211 - 7c3bad9141dc |
214 - 7c3bad9141dc |
212 0 |
215 0 |
213 - 1f0dee641bb7 |
216 - 1f0dee641bb7 |
227 adding file changes |
230 adding file changes |
228 added 1 changesets with 1 changes to 1 files (+1 heads) |
231 added 1 changesets with 1 changes to 1 files (+1 heads) |
229 (run 'hg heads .' to see heads, 'hg merge' to merge) |
232 (run 'hg heads .' to see heads, 'hg merge' to merge) |
230 |
233 |
231 $ qlog -R ../other-new |
234 $ qlog -R ../other-new |
232 8 |
235 7 |
233 - 159dfc9fa5d3 |
236 - 159dfc9fa5d3 |
234 3 |
237 3 |
235 - 725c380fe99b |
238 - 725c380fe99b |
236 2 |
239 2 |
237 - 0d3f46688ccc |
240 - 0d3f46688ccc |
238 1 |
241 1 |
239 - 7c3bad9141dc |
242 - 7c3bad9141dc |
240 0 |
243 0 |
241 - 1f0dee641bb7 |
244 - 1f0dee641bb7 |
242 $ hg -R ../other-new rollback |
245 $ hg -R ../other-new rollback |
243 repository tip rolled back to revision 7 (undo pull) |
246 repository tip rolled back to revision 6 (undo pull) |
244 $ qlog -R ../other-new |
247 $ qlog -R ../other-new |
245 7 |
248 6 |
246 - 909a0fb57e5d |
249 - 909a0fb57e5d |
247 3 |
250 3 |
248 - 725c380fe99b |
251 - 725c380fe99b |
249 2 |
252 2 |
250 - 0d3f46688ccc |
253 - 0d3f46688ccc |