Show More
@@ -1,751 +1,751 b'' | |||||
1 | Test file dedicated to testing the divergent troubles from obsolete changeset. |
|
1 | Test file dedicated to testing the divergent troubles from obsolete changeset. | |
2 |
|
2 | |||
3 | This is the most complex troubles from far so we isolate it in a dedicated |
|
3 | This is the most complex troubles from far so we isolate it in a dedicated | |
4 | file. |
|
4 | file. | |
5 |
|
5 | |||
6 | Enable obsolete |
|
6 | Enable obsolete | |
7 |
|
7 | |||
8 | $ cat >> $HGRCPATH << EOF |
|
8 | $ cat >> $HGRCPATH << EOF | |
9 | > [ui] |
|
9 | > [ui] | |
10 | > logtemplate = {rev}:{node|short} {desc}{if(obsfate, " [{join(obsfate, "; ")}]")}\n |
|
10 | > logtemplate = {rev}:{node|short} {desc}{if(obsfate, " [{join(obsfate, "; ")}]")}\n | |
11 | > [experimental] |
|
11 | > [experimental] | |
12 | > evolution.createmarkers=True |
|
12 | > evolution.createmarkers=True | |
13 | > [extensions] |
|
13 | > [extensions] | |
14 | > drawdag=$TESTDIR/drawdag.py |
|
14 | > drawdag=$TESTDIR/drawdag.py | |
15 | > [alias] |
|
15 | > [alias] | |
16 | > debugobsolete = debugobsolete -d '0 0' |
|
16 | > debugobsolete = debugobsolete -d '0 0' | |
17 | > [phases] |
|
17 | > [phases] | |
18 | > publish=False |
|
18 | > publish=False | |
19 | > EOF |
|
19 | > EOF | |
20 |
|
20 | |||
21 |
|
21 | |||
22 | $ mkcommit() { |
|
22 | $ mkcommit() { | |
23 | > echo "$1" > "$1" |
|
23 | > echo "$1" > "$1" | |
24 | > hg add "$1" |
|
24 | > hg add "$1" | |
25 | > hg ci -m "$1" |
|
25 | > hg ci -m "$1" | |
26 | > } |
|
26 | > } | |
27 | $ getid() { |
|
27 | $ getid() { | |
28 | > hg log --hidden -r "desc('$1')" -T '{node}\n' |
|
28 | > hg log --hidden -r "desc('$1')" -T '{node}\n' | |
29 | > } |
|
29 | > } | |
30 |
|
30 | |||
31 | setup repo |
|
31 | setup repo | |
32 |
|
32 | |||
33 | $ hg init reference |
|
33 | $ hg init reference | |
34 | $ cd reference |
|
34 | $ cd reference | |
35 | $ mkcommit base |
|
35 | $ mkcommit base | |
36 | $ mkcommit A_0 |
|
36 | $ mkcommit A_0 | |
37 | $ hg up 0 |
|
37 | $ hg up 0 | |
38 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
38 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
39 | $ mkcommit A_1 |
|
39 | $ mkcommit A_1 | |
40 | created new head |
|
40 | created new head | |
41 | $ hg up 0 |
|
41 | $ hg up 0 | |
42 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
42 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
43 | $ mkcommit A_2 |
|
43 | $ mkcommit A_2 | |
44 | created new head |
|
44 | created new head | |
45 | $ hg up 0 |
|
45 | $ hg up 0 | |
46 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
46 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
47 | $ cd .. |
|
47 | $ cd .. | |
48 |
|
48 | |||
49 |
|
49 | |||
50 | $ newcase() { |
|
50 | $ newcase() { | |
51 | > hg clone -u 0 -q reference $1 |
|
51 | > hg clone -u 0 -q reference $1 | |
52 | > cd $1 |
|
52 | > cd $1 | |
53 | > } |
|
53 | > } | |
54 |
|
54 | |||
55 | direct divergence |
|
55 | direct divergence | |
56 | ----------------- |
|
56 | ----------------- | |
57 |
|
57 | |||
58 | A_1 have two direct and divergent successors A_1 and A_1 |
|
58 | A_1 have two direct and divergent successors A_1 and A_1 | |
59 |
|
59 | |||
60 | $ newcase direct |
|
60 | $ newcase direct | |
61 | $ hg debugobsolete `getid A_0` `getid A_1` |
|
61 | $ hg debugobsolete `getid A_0` `getid A_1` | |
62 | obsoleted 1 changesets |
|
62 | obsoleted 1 changesets | |
63 | $ hg debugobsolete `getid A_0` `getid A_2` |
|
63 | $ hg debugobsolete `getid A_0` `getid A_2` | |
64 | 2 new content-divergent changesets |
|
64 | 2 new content-divergent changesets | |
65 | $ hg log -G --hidden |
|
65 | $ hg log -G --hidden | |
66 | * 3:392fd25390da A_2 |
|
66 | * 3:392fd25390da A_2 | |
67 | | |
|
67 | | | |
68 | | * 2:82623d38b9ba A_1 |
|
68 | | * 2:82623d38b9ba A_1 | |
69 | |/ |
|
69 | |/ | |
70 | | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] |
|
70 | | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] | |
71 | |/ |
|
71 | |/ | |
72 | @ 0:d20a80d4def3 base |
|
72 | @ 0:d20a80d4def3 base | |
73 |
|
73 | |||
74 | $ hg debugsuccessorssets --hidden 'all()' |
|
74 | $ hg debugsuccessorssets --hidden 'all()' | |
75 | d20a80d4def3 |
|
75 | d20a80d4def3 | |
76 | d20a80d4def3 |
|
76 | d20a80d4def3 | |
77 | 007dc284c1f8 |
|
77 | 007dc284c1f8 | |
78 | 82623d38b9ba |
|
78 | 82623d38b9ba | |
79 | 392fd25390da |
|
79 | 392fd25390da | |
80 | 82623d38b9ba |
|
80 | 82623d38b9ba | |
81 | 82623d38b9ba |
|
81 | 82623d38b9ba | |
82 | 392fd25390da |
|
82 | 392fd25390da | |
83 | 392fd25390da |
|
83 | 392fd25390da | |
84 | $ hg log -r 'contentdivergent()' |
|
84 | $ hg log -r 'contentdivergent()' | |
85 | 2:82623d38b9ba A_1 |
|
85 | 2:82623d38b9ba A_1 | |
86 | 3:392fd25390da A_2 |
|
86 | 3:392fd25390da A_2 | |
87 | $ hg debugsuccessorssets 'all()' --closest |
|
87 | $ hg debugsuccessorssets 'all()' --closest | |
88 | d20a80d4def3 |
|
88 | d20a80d4def3 | |
89 | d20a80d4def3 |
|
89 | d20a80d4def3 | |
90 | 82623d38b9ba |
|
90 | 82623d38b9ba | |
91 | 82623d38b9ba |
|
91 | 82623d38b9ba | |
92 | 392fd25390da |
|
92 | 392fd25390da | |
93 | 392fd25390da |
|
93 | 392fd25390da | |
94 | $ hg debugsuccessorssets 'all()' --closest --hidden |
|
94 | $ hg debugsuccessorssets 'all()' --closest --hidden | |
95 | d20a80d4def3 |
|
95 | d20a80d4def3 | |
96 | d20a80d4def3 |
|
96 | d20a80d4def3 | |
97 | 007dc284c1f8 |
|
97 | 007dc284c1f8 | |
98 | 82623d38b9ba |
|
98 | 82623d38b9ba | |
99 | 392fd25390da |
|
99 | 392fd25390da | |
100 | 82623d38b9ba |
|
100 | 82623d38b9ba | |
101 | 82623d38b9ba |
|
101 | 82623d38b9ba | |
102 | 392fd25390da |
|
102 | 392fd25390da | |
103 | 392fd25390da |
|
103 | 392fd25390da | |
104 |
|
104 | |||
105 | check that mercurial refuse to push |
|
105 | check that mercurial refuse to push | |
106 |
|
106 | |||
107 | $ hg init ../other |
|
107 | $ hg init ../other | |
108 | $ hg push ../other |
|
108 | $ hg push ../other | |
109 | pushing to ../other |
|
109 | pushing to ../other | |
110 | searching for changes |
|
110 | searching for changes | |
111 | abort: push includes content-divergent changeset: 392fd25390da! |
|
111 | abort: push includes content-divergent changeset: 392fd25390da! | |
112 | [255] |
|
112 | [255] | |
113 |
|
113 | |||
114 | $ cd .. |
|
114 | $ cd .. | |
115 |
|
115 | |||
116 |
|
116 | |||
117 | indirect divergence with known changeset |
|
117 | indirect divergence with known changeset | |
118 | ------------------------------------------- |
|
118 | ------------------------------------------- | |
119 |
|
119 | |||
120 | $ newcase indirect_known |
|
120 | $ newcase indirect_known | |
121 | $ hg debugobsolete `getid A_0` `getid A_1` |
|
121 | $ hg debugobsolete `getid A_0` `getid A_1` | |
122 | obsoleted 1 changesets |
|
122 | obsoleted 1 changesets | |
123 | $ hg debugobsolete `getid A_0` `getid A_2` |
|
123 | $ hg debugobsolete `getid A_0` `getid A_2` | |
124 | 2 new content-divergent changesets |
|
124 | 2 new content-divergent changesets | |
125 | $ mkcommit A_3 |
|
125 | $ mkcommit A_3 | |
126 | created new head |
|
126 | created new head | |
127 | $ hg debugobsolete `getid A_2` `getid A_3` |
|
127 | $ hg debugobsolete `getid A_2` `getid A_3` | |
128 | obsoleted 1 changesets |
|
128 | obsoleted 1 changesets | |
129 | $ hg log -G --hidden |
|
129 | $ hg log -G --hidden | |
130 | @ 4:01f36c5a8fda A_3 |
|
130 | @ 4:01f36c5a8fda A_3 | |
131 | | |
|
131 | | | |
132 | | x 3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda] |
|
132 | | x 3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda] | |
133 | |/ |
|
133 | |/ | |
134 | | * 2:82623d38b9ba A_1 |
|
134 | | * 2:82623d38b9ba A_1 | |
135 | |/ |
|
135 | |/ | |
136 | | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] |
|
136 | | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] | |
137 | |/ |
|
137 | |/ | |
138 | o 0:d20a80d4def3 base |
|
138 | o 0:d20a80d4def3 base | |
139 |
|
139 | |||
140 | $ hg debugsuccessorssets --hidden 'all()' |
|
140 | $ hg debugsuccessorssets --hidden 'all()' | |
141 | d20a80d4def3 |
|
141 | d20a80d4def3 | |
142 | d20a80d4def3 |
|
142 | d20a80d4def3 | |
143 | 007dc284c1f8 |
|
143 | 007dc284c1f8 | |
144 | 82623d38b9ba |
|
144 | 82623d38b9ba | |
145 | 01f36c5a8fda |
|
145 | 01f36c5a8fda | |
146 | 82623d38b9ba |
|
146 | 82623d38b9ba | |
147 | 82623d38b9ba |
|
147 | 82623d38b9ba | |
148 | 392fd25390da |
|
148 | 392fd25390da | |
149 | 01f36c5a8fda |
|
149 | 01f36c5a8fda | |
150 | 01f36c5a8fda |
|
150 | 01f36c5a8fda | |
151 | 01f36c5a8fda |
|
151 | 01f36c5a8fda | |
152 | $ hg log -r 'contentdivergent()' |
|
152 | $ hg log -r 'contentdivergent()' | |
153 | 2:82623d38b9ba A_1 |
|
153 | 2:82623d38b9ba A_1 | |
154 | 4:01f36c5a8fda A_3 |
|
154 | 4:01f36c5a8fda A_3 | |
155 | $ hg debugsuccessorssets 'all()' --closest |
|
155 | $ hg debugsuccessorssets 'all()' --closest | |
156 | d20a80d4def3 |
|
156 | d20a80d4def3 | |
157 | d20a80d4def3 |
|
157 | d20a80d4def3 | |
158 | 82623d38b9ba |
|
158 | 82623d38b9ba | |
159 | 82623d38b9ba |
|
159 | 82623d38b9ba | |
160 | 01f36c5a8fda |
|
160 | 01f36c5a8fda | |
161 | 01f36c5a8fda |
|
161 | 01f36c5a8fda | |
162 | $ hg debugsuccessorssets 'all()' --closest --hidden |
|
162 | $ hg debugsuccessorssets 'all()' --closest --hidden | |
163 | d20a80d4def3 |
|
163 | d20a80d4def3 | |
164 | d20a80d4def3 |
|
164 | d20a80d4def3 | |
165 | 007dc284c1f8 |
|
165 | 007dc284c1f8 | |
166 | 82623d38b9ba |
|
166 | 82623d38b9ba | |
167 | 392fd25390da |
|
167 | 392fd25390da | |
168 | 82623d38b9ba |
|
168 | 82623d38b9ba | |
169 | 82623d38b9ba |
|
169 | 82623d38b9ba | |
170 | 392fd25390da |
|
170 | 392fd25390da | |
171 | 392fd25390da |
|
171 | 392fd25390da | |
172 | 01f36c5a8fda |
|
172 | 01f36c5a8fda | |
173 | 01f36c5a8fda |
|
173 | 01f36c5a8fda | |
174 | $ cd .. |
|
174 | $ cd .. | |
175 |
|
175 | |||
176 |
|
176 | |||
177 | indirect divergence with known changeset |
|
177 | indirect divergence with known changeset | |
178 | ------------------------------------------- |
|
178 | ------------------------------------------- | |
179 |
|
179 | |||
180 | $ newcase indirect_unknown |
|
180 | $ newcase indirect_unknown | |
181 | $ hg debugobsolete `getid A_0` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa |
|
181 | $ hg debugobsolete `getid A_0` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | |
182 | obsoleted 1 changesets |
|
182 | obsoleted 1 changesets | |
183 | $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid A_1` |
|
183 | $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid A_1` | |
184 | $ hg debugobsolete `getid A_0` `getid A_2` |
|
184 | $ hg debugobsolete `getid A_0` `getid A_2` | |
185 | 2 new content-divergent changesets |
|
185 | 2 new content-divergent changesets | |
186 | $ hg log -G --hidden |
|
186 | $ hg log -G --hidden | |
187 | * 3:392fd25390da A_2 |
|
187 | * 3:392fd25390da A_2 | |
188 | | |
|
188 | | | |
189 | | * 2:82623d38b9ba A_1 |
|
189 | | * 2:82623d38b9ba A_1 | |
190 | |/ |
|
190 | |/ | |
191 | | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] |
|
191 | | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] | |
192 | |/ |
|
192 | |/ | |
193 | @ 0:d20a80d4def3 base |
|
193 | @ 0:d20a80d4def3 base | |
194 |
|
194 | |||
195 | $ hg debugsuccessorssets --hidden 'all()' |
|
195 | $ hg debugsuccessorssets --hidden 'all()' | |
196 | d20a80d4def3 |
|
196 | d20a80d4def3 | |
197 | d20a80d4def3 |
|
197 | d20a80d4def3 | |
198 | 007dc284c1f8 |
|
198 | 007dc284c1f8 | |
199 | 82623d38b9ba |
|
199 | 82623d38b9ba | |
200 | 392fd25390da |
|
200 | 392fd25390da | |
201 | 82623d38b9ba |
|
201 | 82623d38b9ba | |
202 | 82623d38b9ba |
|
202 | 82623d38b9ba | |
203 | 392fd25390da |
|
203 | 392fd25390da | |
204 | 392fd25390da |
|
204 | 392fd25390da | |
205 | $ hg log -r 'contentdivergent()' |
|
205 | $ hg log -r 'contentdivergent()' | |
206 | 2:82623d38b9ba A_1 |
|
206 | 2:82623d38b9ba A_1 | |
207 | 3:392fd25390da A_2 |
|
207 | 3:392fd25390da A_2 | |
208 | $ hg debugsuccessorssets 'all()' --closest |
|
208 | $ hg debugsuccessorssets 'all()' --closest | |
209 | d20a80d4def3 |
|
209 | d20a80d4def3 | |
210 | d20a80d4def3 |
|
210 | d20a80d4def3 | |
211 | 82623d38b9ba |
|
211 | 82623d38b9ba | |
212 | 82623d38b9ba |
|
212 | 82623d38b9ba | |
213 | 392fd25390da |
|
213 | 392fd25390da | |
214 | 392fd25390da |
|
214 | 392fd25390da | |
215 | $ hg debugsuccessorssets 'all()' --closest --hidden |
|
215 | $ hg debugsuccessorssets 'all()' --closest --hidden | |
216 | d20a80d4def3 |
|
216 | d20a80d4def3 | |
217 | d20a80d4def3 |
|
217 | d20a80d4def3 | |
218 | 007dc284c1f8 |
|
218 | 007dc284c1f8 | |
219 | 82623d38b9ba |
|
219 | 82623d38b9ba | |
220 | 392fd25390da |
|
220 | 392fd25390da | |
221 | 82623d38b9ba |
|
221 | 82623d38b9ba | |
222 | 82623d38b9ba |
|
222 | 82623d38b9ba | |
223 | 392fd25390da |
|
223 | 392fd25390da | |
224 | 392fd25390da |
|
224 | 392fd25390da | |
225 | $ cd .. |
|
225 | $ cd .. | |
226 |
|
226 | |||
227 | do not take unknown node in account if they are final |
|
227 | do not take unknown node in account if they are final | |
228 | ----------------------------------------------------- |
|
228 | ----------------------------------------------------- | |
229 |
|
229 | |||
230 | $ newcase final-unknown |
|
230 | $ newcase final-unknown | |
231 | $ hg debugobsolete `getid A_0` `getid A_1` |
|
231 | $ hg debugobsolete `getid A_0` `getid A_1` | |
232 | obsoleted 1 changesets |
|
232 | obsoleted 1 changesets | |
233 | $ hg debugobsolete `getid A_1` `getid A_2` |
|
233 | $ hg debugobsolete `getid A_1` `getid A_2` | |
234 | obsoleted 1 changesets |
|
234 | obsoleted 1 changesets | |
235 | $ hg debugobsolete `getid A_0` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb |
|
235 | $ hg debugobsolete `getid A_0` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb | |
236 | $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb cccccccccccccccccccccccccccccccccccccccc |
|
236 | $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb cccccccccccccccccccccccccccccccccccccccc | |
237 | $ hg debugobsolete `getid A_1` dddddddddddddddddddddddddddddddddddddddd |
|
237 | $ hg debugobsolete `getid A_1` dddddddddddddddddddddddddddddddddddddddd | |
238 |
|
238 | |||
239 | $ hg debugsuccessorssets --hidden 'desc('A_0')' |
|
239 | $ hg debugsuccessorssets --hidden 'desc('A_0')' | |
240 | 007dc284c1f8 |
|
240 | 007dc284c1f8 | |
241 | 392fd25390da |
|
241 | 392fd25390da | |
242 | $ hg debugsuccessorssets 'desc('A_0')' --closest |
|
242 | $ hg debugsuccessorssets 'desc('A_0')' --closest | |
243 | $ hg debugsuccessorssets 'desc('A_0')' --closest --hidden |
|
243 | $ hg debugsuccessorssets 'desc('A_0')' --closest --hidden | |
244 | 007dc284c1f8 |
|
244 | 007dc284c1f8 | |
245 | 82623d38b9ba |
|
245 | 82623d38b9ba | |
246 |
|
246 | |||
247 | $ cd .. |
|
247 | $ cd .. | |
248 |
|
248 | |||
249 | divergence that converge again is not divergence anymore |
|
249 | divergence that converge again is not divergence anymore | |
250 | ----------------------------------------------------- |
|
250 | ----------------------------------------------------- | |
251 |
|
251 | |||
252 | $ newcase converged_divergence |
|
252 | $ newcase converged_divergence | |
253 | $ hg debugobsolete `getid A_0` `getid A_1` |
|
253 | $ hg debugobsolete `getid A_0` `getid A_1` | |
254 | obsoleted 1 changesets |
|
254 | obsoleted 1 changesets | |
255 | $ hg debugobsolete `getid A_0` `getid A_2` |
|
255 | $ hg debugobsolete `getid A_0` `getid A_2` | |
256 | 2 new content-divergent changesets |
|
256 | 2 new content-divergent changesets | |
257 | $ mkcommit A_3 |
|
257 | $ mkcommit A_3 | |
258 | created new head |
|
258 | created new head | |
259 | $ hg debugobsolete `getid A_1` `getid A_3` |
|
259 | $ hg debugobsolete `getid A_1` `getid A_3` | |
260 | obsoleted 1 changesets |
|
260 | obsoleted 1 changesets | |
261 | $ hg debugobsolete `getid A_2` `getid A_3` |
|
261 | $ hg debugobsolete `getid A_2` `getid A_3` | |
262 | obsoleted 1 changesets |
|
262 | obsoleted 1 changesets | |
263 | $ hg log -G --hidden |
|
263 | $ hg log -G --hidden | |
264 | @ 4:01f36c5a8fda A_3 |
|
264 | @ 4:01f36c5a8fda A_3 | |
265 | | |
|
265 | | | |
266 | | x 3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda] |
|
266 | | x 3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda] | |
267 | |/ |
|
267 | |/ | |
268 | | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda] |
|
268 | | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda] | |
269 | |/ |
|
269 | |/ | |
270 | | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] |
|
270 | | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] | |
271 | |/ |
|
271 | |/ | |
272 | o 0:d20a80d4def3 base |
|
272 | o 0:d20a80d4def3 base | |
273 |
|
273 | |||
274 | $ hg debugsuccessorssets --hidden 'all()' |
|
274 | $ hg debugsuccessorssets --hidden 'all()' | |
275 | d20a80d4def3 |
|
275 | d20a80d4def3 | |
276 | d20a80d4def3 |
|
276 | d20a80d4def3 | |
277 | 007dc284c1f8 |
|
277 | 007dc284c1f8 | |
278 | 01f36c5a8fda |
|
278 | 01f36c5a8fda | |
279 | 82623d38b9ba |
|
279 | 82623d38b9ba | |
280 | 01f36c5a8fda |
|
280 | 01f36c5a8fda | |
281 | 392fd25390da |
|
281 | 392fd25390da | |
282 | 01f36c5a8fda |
|
282 | 01f36c5a8fda | |
283 | 01f36c5a8fda |
|
283 | 01f36c5a8fda | |
284 | 01f36c5a8fda |
|
284 | 01f36c5a8fda | |
285 | $ hg log -r 'contentdivergent()' |
|
285 | $ hg log -r 'contentdivergent()' | |
286 | $ hg debugsuccessorssets 'all()' --closest |
|
286 | $ hg debugsuccessorssets 'all()' --closest | |
287 | d20a80d4def3 |
|
287 | d20a80d4def3 | |
288 | d20a80d4def3 |
|
288 | d20a80d4def3 | |
289 | 01f36c5a8fda |
|
289 | 01f36c5a8fda | |
290 | 01f36c5a8fda |
|
290 | 01f36c5a8fda | |
291 | $ hg debugsuccessorssets 'all()' --closest --hidden |
|
291 | $ hg debugsuccessorssets 'all()' --closest --hidden | |
292 | d20a80d4def3 |
|
292 | d20a80d4def3 | |
293 | d20a80d4def3 |
|
293 | d20a80d4def3 | |
294 | 007dc284c1f8 |
|
294 | 007dc284c1f8 | |
295 | 82623d38b9ba |
|
295 | 82623d38b9ba | |
296 | 392fd25390da |
|
296 | 392fd25390da | |
297 | 82623d38b9ba |
|
297 | 82623d38b9ba | |
298 | 82623d38b9ba |
|
298 | 82623d38b9ba | |
299 | 392fd25390da |
|
299 | 392fd25390da | |
300 | 392fd25390da |
|
300 | 392fd25390da | |
301 | 01f36c5a8fda |
|
301 | 01f36c5a8fda | |
302 | 01f36c5a8fda |
|
302 | 01f36c5a8fda | |
303 | $ cd .. |
|
303 | $ cd .. | |
304 |
|
304 | |||
305 | split is not divergences |
|
305 | split is not divergences | |
306 | ----------------------------- |
|
306 | ----------------------------- | |
307 |
|
307 | |||
308 | $ newcase split |
|
308 | $ newcase split | |
309 | $ hg debugobsolete `getid A_0` `getid A_1` `getid A_2` |
|
309 | $ hg debugobsolete `getid A_0` `getid A_1` `getid A_2` | |
310 | obsoleted 1 changesets |
|
310 | obsoleted 1 changesets | |
311 | $ hg log -G --hidden |
|
311 | $ hg log -G --hidden | |
312 | o 3:392fd25390da A_2 |
|
312 | o 3:392fd25390da A_2 | |
313 | | |
|
313 | | | |
314 | | o 2:82623d38b9ba A_1 |
|
314 | | o 2:82623d38b9ba A_1 | |
315 | |/ |
|
315 | |/ | |
316 | | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da] |
|
316 | | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da] | |
317 | |/ |
|
317 | |/ | |
318 | @ 0:d20a80d4def3 base |
|
318 | @ 0:d20a80d4def3 base | |
319 |
|
319 | |||
320 | $ hg debugsuccessorssets --hidden 'all()' |
|
320 | $ hg debugsuccessorssets --hidden 'all()' | |
321 | d20a80d4def3 |
|
321 | d20a80d4def3 | |
322 | d20a80d4def3 |
|
322 | d20a80d4def3 | |
323 | 007dc284c1f8 |
|
323 | 007dc284c1f8 | |
324 | 82623d38b9ba 392fd25390da |
|
324 | 82623d38b9ba 392fd25390da | |
325 | 82623d38b9ba |
|
325 | 82623d38b9ba | |
326 | 82623d38b9ba |
|
326 | 82623d38b9ba | |
327 | 392fd25390da |
|
327 | 392fd25390da | |
328 | 392fd25390da |
|
328 | 392fd25390da | |
329 | $ hg log -r 'contentdivergent()' |
|
329 | $ hg log -r 'contentdivergent()' | |
330 | $ hg debugsuccessorssets 'all()' --closest |
|
330 | $ hg debugsuccessorssets 'all()' --closest | |
331 | d20a80d4def3 |
|
331 | d20a80d4def3 | |
332 | d20a80d4def3 |
|
332 | d20a80d4def3 | |
333 | 82623d38b9ba |
|
333 | 82623d38b9ba | |
334 | 82623d38b9ba |
|
334 | 82623d38b9ba | |
335 | 392fd25390da |
|
335 | 392fd25390da | |
336 | 392fd25390da |
|
336 | 392fd25390da | |
337 | $ hg debugsuccessorssets 'all()' --closest --hidden |
|
337 | $ hg debugsuccessorssets 'all()' --closest --hidden | |
338 | d20a80d4def3 |
|
338 | d20a80d4def3 | |
339 | d20a80d4def3 |
|
339 | d20a80d4def3 | |
340 | 007dc284c1f8 |
|
340 | 007dc284c1f8 | |
341 | 82623d38b9ba 392fd25390da |
|
341 | 82623d38b9ba 392fd25390da | |
342 | 82623d38b9ba |
|
342 | 82623d38b9ba | |
343 | 82623d38b9ba |
|
343 | 82623d38b9ba | |
344 | 392fd25390da |
|
344 | 392fd25390da | |
345 | 392fd25390da |
|
345 | 392fd25390da | |
346 |
|
346 | |||
347 | Even when subsequent rewriting happen |
|
347 | Even when subsequent rewriting happen | |
348 |
|
348 | |||
349 | $ mkcommit A_3 |
|
349 | $ mkcommit A_3 | |
350 | created new head |
|
350 | created new head | |
351 | $ hg debugobsolete `getid A_1` `getid A_3` |
|
351 | $ hg debugobsolete `getid A_1` `getid A_3` | |
352 | obsoleted 1 changesets |
|
352 | obsoleted 1 changesets | |
353 | $ hg up 0 |
|
353 | $ hg up 0 | |
354 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
354 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
355 | $ mkcommit A_4 |
|
355 | $ mkcommit A_4 | |
356 | created new head |
|
356 | created new head | |
357 | $ hg debugobsolete `getid A_2` `getid A_4` |
|
357 | $ hg debugobsolete `getid A_2` `getid A_4` | |
358 | obsoleted 1 changesets |
|
358 | obsoleted 1 changesets | |
359 | $ hg up 0 |
|
359 | $ hg up 0 | |
360 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
360 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
361 | $ mkcommit A_5 |
|
361 | $ mkcommit A_5 | |
362 | created new head |
|
362 | created new head | |
363 | $ hg debugobsolete `getid A_4` `getid A_5` |
|
363 | $ hg debugobsolete `getid A_4` `getid A_5` | |
364 | obsoleted 1 changesets |
|
364 | obsoleted 1 changesets | |
365 | $ hg log -G --hidden |
|
365 | $ hg log -G --hidden | |
366 | @ 6:e442cfc57690 A_5 |
|
366 | @ 6:e442cfc57690 A_5 | |
367 | | |
|
367 | | | |
368 | | x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690] |
|
368 | | x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690] | |
369 | |/ |
|
369 | |/ | |
370 | | o 4:01f36c5a8fda A_3 |
|
370 | | o 4:01f36c5a8fda A_3 | |
371 | |/ |
|
371 | |/ | |
372 | | x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a] |
|
372 | | x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a] | |
373 | |/ |
|
373 | |/ | |
374 | | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda] |
|
374 | | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda] | |
375 | |/ |
|
375 | |/ | |
376 | | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da] |
|
376 | | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da] | |
377 | |/ |
|
377 | |/ | |
378 | o 0:d20a80d4def3 base |
|
378 | o 0:d20a80d4def3 base | |
379 |
|
379 | |||
380 | $ hg debugsuccessorssets --hidden 'all()' |
|
380 | $ hg debugsuccessorssets --hidden 'all()' | |
381 | d20a80d4def3 |
|
381 | d20a80d4def3 | |
382 | d20a80d4def3 |
|
382 | d20a80d4def3 | |
383 | 007dc284c1f8 |
|
383 | 007dc284c1f8 | |
384 | 01f36c5a8fda e442cfc57690 |
|
384 | 01f36c5a8fda e442cfc57690 | |
385 | 82623d38b9ba |
|
385 | 82623d38b9ba | |
386 | 01f36c5a8fda |
|
386 | 01f36c5a8fda | |
387 | 392fd25390da |
|
387 | 392fd25390da | |
388 | e442cfc57690 |
|
388 | e442cfc57690 | |
389 | 01f36c5a8fda |
|
389 | 01f36c5a8fda | |
390 | 01f36c5a8fda |
|
390 | 01f36c5a8fda | |
391 | 6a411f0d7a0a |
|
391 | 6a411f0d7a0a | |
392 | e442cfc57690 |
|
392 | e442cfc57690 | |
393 | e442cfc57690 |
|
393 | e442cfc57690 | |
394 | e442cfc57690 |
|
394 | e442cfc57690 | |
395 | $ hg debugsuccessorssets 'all()' --closest |
|
395 | $ hg debugsuccessorssets 'all()' --closest | |
396 | d20a80d4def3 |
|
396 | d20a80d4def3 | |
397 | d20a80d4def3 |
|
397 | d20a80d4def3 | |
398 | 01f36c5a8fda |
|
398 | 01f36c5a8fda | |
399 | 01f36c5a8fda |
|
399 | 01f36c5a8fda | |
400 | e442cfc57690 |
|
400 | e442cfc57690 | |
401 | e442cfc57690 |
|
401 | e442cfc57690 | |
402 | $ hg debugsuccessorssets 'all()' --closest --hidden |
|
402 | $ hg debugsuccessorssets 'all()' --closest --hidden | |
403 | d20a80d4def3 |
|
403 | d20a80d4def3 | |
404 | d20a80d4def3 |
|
404 | d20a80d4def3 | |
405 | 007dc284c1f8 |
|
405 | 007dc284c1f8 | |
406 | 82623d38b9ba 392fd25390da |
|
406 | 82623d38b9ba 392fd25390da | |
407 | 82623d38b9ba |
|
407 | 82623d38b9ba | |
408 | 82623d38b9ba |
|
408 | 82623d38b9ba | |
409 | 392fd25390da |
|
409 | 392fd25390da | |
410 | 392fd25390da |
|
410 | 392fd25390da | |
411 | 01f36c5a8fda |
|
411 | 01f36c5a8fda | |
412 | 01f36c5a8fda |
|
412 | 01f36c5a8fda | |
413 | 6a411f0d7a0a |
|
413 | 6a411f0d7a0a | |
414 | e442cfc57690 |
|
414 | e442cfc57690 | |
415 | e442cfc57690 |
|
415 | e442cfc57690 | |
416 | e442cfc57690 |
|
416 | e442cfc57690 | |
417 | $ hg log -r 'contentdivergent()' |
|
417 | $ hg log -r 'contentdivergent()' | |
418 |
|
418 | |||
419 | Check more complex obsolescence graft (with divergence) |
|
419 | Check more complex obsolescence graft (with divergence) | |
420 |
|
420 | |||
421 | $ mkcommit B_0; hg up 0 |
|
421 | $ mkcommit B_0; hg up 0 | |
422 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
422 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
423 | $ hg debugobsolete `getid B_0` `getid A_2` |
|
423 | $ hg debugobsolete `getid B_0` `getid A_2` | |
424 | obsoleted 1 changesets |
|
424 | obsoleted 1 changesets | |
425 | $ mkcommit A_7; hg up 0 |
|
425 | $ mkcommit A_7; hg up 0 | |
426 | created new head |
|
426 | created new head | |
427 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
427 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
428 | $ mkcommit A_8; hg up 0 |
|
428 | $ mkcommit A_8; hg up 0 | |
429 | created new head |
|
429 | created new head | |
430 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
430 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
431 | $ hg debugobsolete `getid A_5` `getid A_7` `getid A_8` |
|
431 | $ hg debugobsolete `getid A_5` `getid A_7` `getid A_8` | |
432 | obsoleted 1 changesets |
|
432 | obsoleted 1 changesets | |
433 | $ mkcommit A_9; hg up 0 |
|
433 | $ mkcommit A_9; hg up 0 | |
434 | created new head |
|
434 | created new head | |
435 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
435 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
436 | $ hg debugobsolete `getid A_5` `getid A_9` |
|
436 | $ hg debugobsolete `getid A_5` `getid A_9` | |
437 | 4 new content-divergent changesets |
|
437 | 4 new content-divergent changesets | |
438 | $ hg log -G --hidden |
|
438 | $ hg log -G --hidden | |
439 | * 10:bed64f5d2f5a A_9 |
|
439 | * 10:bed64f5d2f5a A_9 | |
440 | | |
|
440 | | | |
441 | | * 9:14608b260df8 A_8 |
|
441 | | * 9:14608b260df8 A_8 | |
442 | |/ |
|
442 | |/ | |
443 | | * 8:7ae126973a96 A_7 |
|
443 | | * 8:7ae126973a96 A_7 | |
444 | |/ |
|
444 | |/ | |
445 | | x 7:3750ebee865d B_0 [rewritten as 3:392fd25390da] |
|
445 | | x 7:3750ebee865d B_0 [rewritten as 3:392fd25390da] | |
446 | | | |
|
446 | | | | |
447 | | x 6:e442cfc57690 A_5 [rewritten as 10:bed64f5d2f5a; split as 8:7ae126973a96, 9:14608b260df8] |
|
447 | | x 6:e442cfc57690 A_5 [rewritten as 10:bed64f5d2f5a; split as 8:7ae126973a96, 9:14608b260df8] | |
448 | |/ |
|
448 | |/ | |
449 | | x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690] |
|
449 | | x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690] | |
450 | |/ |
|
450 | |/ | |
451 | | * 4:01f36c5a8fda A_3 |
|
451 | | * 4:01f36c5a8fda A_3 | |
452 | |/ |
|
452 | |/ | |
453 | | x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a] |
|
453 | | x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a] | |
454 | |/ |
|
454 | |/ | |
455 | | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda] |
|
455 | | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda] | |
456 | |/ |
|
456 | |/ | |
457 | | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da] |
|
457 | | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da] | |
458 | |/ |
|
458 | |/ | |
459 | @ 0:d20a80d4def3 base |
|
459 | @ 0:d20a80d4def3 base | |
460 |
|
460 | |||
461 | $ hg debugsuccessorssets --hidden 'all()' |
|
461 | $ hg debugsuccessorssets --hidden 'all()' | |
462 | d20a80d4def3 |
|
462 | d20a80d4def3 | |
463 | d20a80d4def3 |
|
463 | d20a80d4def3 | |
464 | 007dc284c1f8 |
|
464 | 007dc284c1f8 | |
465 | 01f36c5a8fda bed64f5d2f5a |
|
465 | 01f36c5a8fda bed64f5d2f5a | |
466 | 01f36c5a8fda 7ae126973a96 14608b260df8 |
|
466 | 01f36c5a8fda 7ae126973a96 14608b260df8 | |
467 | 82623d38b9ba |
|
467 | 82623d38b9ba | |
468 | 01f36c5a8fda |
|
468 | 01f36c5a8fda | |
469 | 392fd25390da |
|
469 | 392fd25390da | |
470 | bed64f5d2f5a |
|
470 | bed64f5d2f5a | |
471 | 7ae126973a96 14608b260df8 |
|
471 | 7ae126973a96 14608b260df8 | |
472 | 01f36c5a8fda |
|
472 | 01f36c5a8fda | |
473 | 01f36c5a8fda |
|
473 | 01f36c5a8fda | |
474 | 6a411f0d7a0a |
|
474 | 6a411f0d7a0a | |
475 | bed64f5d2f5a |
|
475 | bed64f5d2f5a | |
476 | 7ae126973a96 14608b260df8 |
|
476 | 7ae126973a96 14608b260df8 | |
477 | e442cfc57690 |
|
477 | e442cfc57690 | |
478 | bed64f5d2f5a |
|
478 | bed64f5d2f5a | |
479 | 7ae126973a96 14608b260df8 |
|
479 | 7ae126973a96 14608b260df8 | |
480 | 3750ebee865d |
|
480 | 3750ebee865d | |
481 | bed64f5d2f5a |
|
481 | bed64f5d2f5a | |
482 | 7ae126973a96 14608b260df8 |
|
482 | 7ae126973a96 14608b260df8 | |
483 | 7ae126973a96 |
|
483 | 7ae126973a96 | |
484 | 7ae126973a96 |
|
484 | 7ae126973a96 | |
485 | 14608b260df8 |
|
485 | 14608b260df8 | |
486 | 14608b260df8 |
|
486 | 14608b260df8 | |
487 | bed64f5d2f5a |
|
487 | bed64f5d2f5a | |
488 | bed64f5d2f5a |
|
488 | bed64f5d2f5a | |
489 | $ hg debugsuccessorssets 'all()' --closest |
|
489 | $ hg debugsuccessorssets 'all()' --closest | |
490 | d20a80d4def3 |
|
490 | d20a80d4def3 | |
491 | d20a80d4def3 |
|
491 | d20a80d4def3 | |
492 | 01f36c5a8fda |
|
492 | 01f36c5a8fda | |
493 | 01f36c5a8fda |
|
493 | 01f36c5a8fda | |
494 | 7ae126973a96 |
|
494 | 7ae126973a96 | |
495 | 7ae126973a96 |
|
495 | 7ae126973a96 | |
496 | 14608b260df8 |
|
496 | 14608b260df8 | |
497 | 14608b260df8 |
|
497 | 14608b260df8 | |
498 | bed64f5d2f5a |
|
498 | bed64f5d2f5a | |
499 | bed64f5d2f5a |
|
499 | bed64f5d2f5a | |
500 | $ hg debugsuccessorssets 'all()' --closest --hidden |
|
500 | $ hg debugsuccessorssets 'all()' --closest --hidden | |
501 | d20a80d4def3 |
|
501 | d20a80d4def3 | |
502 | d20a80d4def3 |
|
502 | d20a80d4def3 | |
503 | 007dc284c1f8 |
|
503 | 007dc284c1f8 | |
504 | 82623d38b9ba 392fd25390da |
|
504 | 82623d38b9ba 392fd25390da | |
505 | 82623d38b9ba |
|
505 | 82623d38b9ba | |
506 | 82623d38b9ba |
|
506 | 82623d38b9ba | |
507 | 392fd25390da |
|
507 | 392fd25390da | |
508 | 392fd25390da |
|
508 | 392fd25390da | |
509 | 01f36c5a8fda |
|
509 | 01f36c5a8fda | |
510 | 01f36c5a8fda |
|
510 | 01f36c5a8fda | |
511 | 6a411f0d7a0a |
|
511 | 6a411f0d7a0a | |
512 | e442cfc57690 |
|
512 | e442cfc57690 | |
513 | e442cfc57690 |
|
513 | e442cfc57690 | |
514 | e442cfc57690 |
|
514 | e442cfc57690 | |
515 | 3750ebee865d |
|
515 | 3750ebee865d | |
516 | 392fd25390da |
|
516 | 392fd25390da | |
517 | 7ae126973a96 |
|
517 | 7ae126973a96 | |
518 | 7ae126973a96 |
|
518 | 7ae126973a96 | |
519 | 14608b260df8 |
|
519 | 14608b260df8 | |
520 | 14608b260df8 |
|
520 | 14608b260df8 | |
521 | bed64f5d2f5a |
|
521 | bed64f5d2f5a | |
522 | bed64f5d2f5a |
|
522 | bed64f5d2f5a | |
523 | $ hg log -r 'contentdivergent()' |
|
523 | $ hg log -r 'contentdivergent()' | |
524 | 4:01f36c5a8fda A_3 |
|
524 | 4:01f36c5a8fda A_3 | |
525 | 8:7ae126973a96 A_7 |
|
525 | 8:7ae126973a96 A_7 | |
526 | 9:14608b260df8 A_8 |
|
526 | 9:14608b260df8 A_8 | |
527 | 10:bed64f5d2f5a A_9 |
|
527 | 10:bed64f5d2f5a A_9 | |
528 |
|
528 | |||
529 | fix the divergence |
|
529 | fix the divergence | |
530 |
|
530 | |||
531 | $ mkcommit A_A; hg up 0 |
|
531 | $ mkcommit A_A; hg up 0 | |
532 | created new head |
|
532 | created new head | |
533 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
533 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
534 | $ hg debugobsolete `getid A_9` `getid A_A` |
|
534 | $ hg debugobsolete `getid A_9` `getid A_A` | |
535 | obsoleted 1 changesets |
|
535 | obsoleted 1 changesets | |
536 | $ hg debugobsolete `getid A_7` `getid A_A` |
|
536 | $ hg debugobsolete `getid A_7` `getid A_A` | |
537 | obsoleted 1 changesets |
|
537 | obsoleted 1 changesets | |
538 | $ hg debugobsolete `getid A_8` `getid A_A` |
|
538 | $ hg debugobsolete `getid A_8` `getid A_A` | |
539 | obsoleted 1 changesets |
|
539 | obsoleted 1 changesets | |
540 | $ hg log -G --hidden |
|
540 | $ hg log -G --hidden | |
541 | o 11:a139f71be9da A_A |
|
541 | o 11:a139f71be9da A_A | |
542 | | |
|
542 | | | |
543 | | x 10:bed64f5d2f5a A_9 [rewritten as 11:a139f71be9da] |
|
543 | | x 10:bed64f5d2f5a A_9 [rewritten as 11:a139f71be9da] | |
544 | |/ |
|
544 | |/ | |
545 | | x 9:14608b260df8 A_8 [rewritten as 11:a139f71be9da] |
|
545 | | x 9:14608b260df8 A_8 [rewritten as 11:a139f71be9da] | |
546 | |/ |
|
546 | |/ | |
547 | | x 8:7ae126973a96 A_7 [rewritten as 11:a139f71be9da] |
|
547 | | x 8:7ae126973a96 A_7 [rewritten as 11:a139f71be9da] | |
548 | |/ |
|
548 | |/ | |
549 | | x 7:3750ebee865d B_0 [rewritten as 3:392fd25390da] |
|
549 | | x 7:3750ebee865d B_0 [rewritten as 3:392fd25390da] | |
550 | | | |
|
550 | | | | |
551 | | x 6:e442cfc57690 A_5 [rewritten as 10:bed64f5d2f5a; split as 8:7ae126973a96, 9:14608b260df8] |
|
551 | | x 6:e442cfc57690 A_5 [rewritten as 10:bed64f5d2f5a; split as 8:7ae126973a96, 9:14608b260df8] | |
552 | |/ |
|
552 | |/ | |
553 | | x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690] |
|
553 | | x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690] | |
554 | |/ |
|
554 | |/ | |
555 | | o 4:01f36c5a8fda A_3 |
|
555 | | o 4:01f36c5a8fda A_3 | |
556 | |/ |
|
556 | |/ | |
557 | | x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a] |
|
557 | | x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a] | |
558 | |/ |
|
558 | |/ | |
559 | | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda] |
|
559 | | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda] | |
560 | |/ |
|
560 | |/ | |
561 | | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da] |
|
561 | | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da] | |
562 | |/ |
|
562 | |/ | |
563 | @ 0:d20a80d4def3 base |
|
563 | @ 0:d20a80d4def3 base | |
564 |
|
564 | |||
565 | $ hg debugsuccessorssets --hidden 'all()' |
|
565 | $ hg debugsuccessorssets --hidden 'all()' | |
566 | d20a80d4def3 |
|
566 | d20a80d4def3 | |
567 | d20a80d4def3 |
|
567 | d20a80d4def3 | |
568 | 007dc284c1f8 |
|
568 | 007dc284c1f8 | |
569 | 01f36c5a8fda a139f71be9da |
|
569 | 01f36c5a8fda a139f71be9da | |
570 | 82623d38b9ba |
|
570 | 82623d38b9ba | |
571 | 01f36c5a8fda |
|
571 | 01f36c5a8fda | |
572 | 392fd25390da |
|
572 | 392fd25390da | |
573 | a139f71be9da |
|
573 | a139f71be9da | |
574 | 01f36c5a8fda |
|
574 | 01f36c5a8fda | |
575 | 01f36c5a8fda |
|
575 | 01f36c5a8fda | |
576 | 6a411f0d7a0a |
|
576 | 6a411f0d7a0a | |
577 | a139f71be9da |
|
577 | a139f71be9da | |
578 | e442cfc57690 |
|
578 | e442cfc57690 | |
579 | a139f71be9da |
|
579 | a139f71be9da | |
580 | 3750ebee865d |
|
580 | 3750ebee865d | |
581 | a139f71be9da |
|
581 | a139f71be9da | |
582 | 7ae126973a96 |
|
582 | 7ae126973a96 | |
583 | a139f71be9da |
|
583 | a139f71be9da | |
584 | 14608b260df8 |
|
584 | 14608b260df8 | |
585 | a139f71be9da |
|
585 | a139f71be9da | |
586 | bed64f5d2f5a |
|
586 | bed64f5d2f5a | |
587 | a139f71be9da |
|
587 | a139f71be9da | |
588 | a139f71be9da |
|
588 | a139f71be9da | |
589 | a139f71be9da |
|
589 | a139f71be9da | |
590 | $ hg debugsuccessorssets 'all()' --closest |
|
590 | $ hg debugsuccessorssets 'all()' --closest | |
591 | d20a80d4def3 |
|
591 | d20a80d4def3 | |
592 | d20a80d4def3 |
|
592 | d20a80d4def3 | |
593 | 01f36c5a8fda |
|
593 | 01f36c5a8fda | |
594 | 01f36c5a8fda |
|
594 | 01f36c5a8fda | |
595 | a139f71be9da |
|
595 | a139f71be9da | |
596 | a139f71be9da |
|
596 | a139f71be9da | |
597 | $ hg debugsuccessorssets 'all()' --closest --hidden |
|
597 | $ hg debugsuccessorssets 'all()' --closest --hidden | |
598 | d20a80d4def3 |
|
598 | d20a80d4def3 | |
599 | d20a80d4def3 |
|
599 | d20a80d4def3 | |
600 | 007dc284c1f8 |
|
600 | 007dc284c1f8 | |
601 | 82623d38b9ba 392fd25390da |
|
601 | 82623d38b9ba 392fd25390da | |
602 | 82623d38b9ba |
|
602 | 82623d38b9ba | |
603 | 82623d38b9ba |
|
603 | 82623d38b9ba | |
604 | 392fd25390da |
|
604 | 392fd25390da | |
605 | 392fd25390da |
|
605 | 392fd25390da | |
606 | 01f36c5a8fda |
|
606 | 01f36c5a8fda | |
607 | 01f36c5a8fda |
|
607 | 01f36c5a8fda | |
608 | 6a411f0d7a0a |
|
608 | 6a411f0d7a0a | |
609 | e442cfc57690 |
|
609 | e442cfc57690 | |
610 | e442cfc57690 |
|
610 | e442cfc57690 | |
611 | e442cfc57690 |
|
611 | e442cfc57690 | |
612 | 3750ebee865d |
|
612 | 3750ebee865d | |
613 | 392fd25390da |
|
613 | 392fd25390da | |
614 | 7ae126973a96 |
|
614 | 7ae126973a96 | |
615 | a139f71be9da |
|
615 | a139f71be9da | |
616 | 14608b260df8 |
|
616 | 14608b260df8 | |
617 | a139f71be9da |
|
617 | a139f71be9da | |
618 | bed64f5d2f5a |
|
618 | bed64f5d2f5a | |
619 | a139f71be9da |
|
619 | a139f71be9da | |
620 | a139f71be9da |
|
620 | a139f71be9da | |
621 | a139f71be9da |
|
621 | a139f71be9da | |
622 | $ hg log -r 'contentdivergent()' |
|
622 | $ hg log -r 'contentdivergent()' | |
623 |
|
623 | |||
624 | #if serve |
|
624 | #if serve | |
625 |
|
625 | |||
626 | $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid --config web.view=all \ |
|
626 | $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid --config web.view=all \ | |
627 | > -A access.log -E errors.log |
|
627 | > -A access.log -E errors.log | |
628 | $ cat hg.pid >> $DAEMON_PIDS |
|
628 | $ cat hg.pid >> $DAEMON_PIDS | |
629 |
|
629 | |||
630 | check an obsolete changeset that was rewritten and also split |
|
630 | check an obsolete changeset that was rewritten and also split | |
631 |
|
631 | |||
632 | $ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=paper' | egrep 'rewritten|split' |
|
632 | $ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=paper' | egrep 'rewritten|split' | |
633 | <td>rewritten as <a href="/rev/bed64f5d2f5a?style=paper">bed64f5d2f5a</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span><br> |
|
633 | <td>rewritten as <a href="/rev/bed64f5d2f5a?style=paper">bed64f5d2f5a</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span><br> | |
634 | split as <a href="/rev/7ae126973a96?style=paper">7ae126973a96</a> <a href="/rev/14608b260df8?style=paper">14608b260df8</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td> |
|
634 | split as <a href="/rev/7ae126973a96?style=paper">7ae126973a96</a> <a href="/rev/14608b260df8?style=paper">14608b260df8</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td> | |
635 | $ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=coal' | egrep 'rewritten|split' |
|
635 | $ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=coal' | egrep 'rewritten|split' | |
636 | <td>rewritten as <a href="/rev/bed64f5d2f5a?style=coal">bed64f5d2f5a</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span><br> |
|
636 | <td>rewritten as <a href="/rev/bed64f5d2f5a?style=coal">bed64f5d2f5a</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span><br> | |
637 | split as <a href="/rev/7ae126973a96?style=coal">7ae126973a96</a> <a href="/rev/14608b260df8?style=coal">14608b260df8</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td> |
|
637 | split as <a href="/rev/7ae126973a96?style=coal">7ae126973a96</a> <a href="/rev/14608b260df8?style=coal">14608b260df8</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td> | |
638 | $ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=gitweb' | egrep 'rewritten|split' |
|
638 | $ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=gitweb' | egrep 'rewritten|split' | |
639 | <td>rewritten as <a class="list" href="/rev/bed64f5d2f5a?style=gitweb">bed64f5d2f5a</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td> |
|
639 | <td>rewritten as <a class="list" href="/rev/bed64f5d2f5a?style=gitweb">bed64f5d2f5a</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td> | |
640 | <td>split as <a class="list" href="/rev/7ae126973a96?style=gitweb">7ae126973a96</a> <a class="list" href="/rev/14608b260df8?style=gitweb">14608b260df8</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td> |
|
640 | <td>split as <a class="list" href="/rev/7ae126973a96?style=gitweb">7ae126973a96</a> <a class="list" href="/rev/14608b260df8?style=gitweb">14608b260df8</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td> | |
641 | $ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=monoblue' | egrep 'rewritten|split' |
|
641 | $ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=monoblue' | egrep 'rewritten|split' | |
642 | <dd>rewritten as <a href="/rev/bed64f5d2f5a?style=monoblue">bed64f5d2f5a</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></dd> |
|
642 | <dd>rewritten as <a href="/rev/bed64f5d2f5a?style=monoblue">bed64f5d2f5a</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></dd> | |
643 | <dd>split as <a href="/rev/7ae126973a96?style=monoblue">7ae126973a96</a> <a href="/rev/14608b260df8?style=monoblue">14608b260df8</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></dd> |
|
643 | <dd>split as <a href="/rev/7ae126973a96?style=monoblue">7ae126973a96</a> <a href="/rev/14608b260df8?style=monoblue">14608b260df8</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></dd> | |
644 | $ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=spartan' | egrep 'rewritten|split' |
|
644 | $ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=spartan' | egrep 'rewritten|split' | |
645 | <td class="obsolete">rewritten as <a href="/rev/bed64f5d2f5a?style=spartan">bed64f5d2f5a</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td> |
|
645 | <td class="obsolete">rewritten as <a href="/rev/bed64f5d2f5a?style=spartan">bed64f5d2f5a</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td> | |
646 | <td class="obsolete">split as <a href="/rev/7ae126973a96?style=spartan">7ae126973a96</a> <a href="/rev/14608b260df8?style=spartan">14608b260df8</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td> |
|
646 | <td class="obsolete">split as <a href="/rev/7ae126973a96?style=spartan">7ae126973a96</a> <a href="/rev/14608b260df8?style=spartan">14608b260df8</a> by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td> | |
647 |
|
647 | |||
648 | $ killdaemons.py |
|
648 | $ killdaemons.py | |
649 |
|
649 | |||
650 | #endif |
|
650 | #endif | |
651 |
|
651 | |||
652 | $ cd .. |
|
652 | $ cd .. | |
653 |
|
653 | |||
654 |
|
654 | |||
655 | Subset does not diverge |
|
655 | Subset does not diverge | |
656 | ------------------------------ |
|
656 | ------------------------------ | |
657 |
|
657 | |||
658 | Do not report divergent successors-set if it is a subset of another |
|
658 | Do not report divergent successors-set if it is a subset of another | |
659 | successors-set. (report [A,B] not [A] + [A,B]) |
|
659 | successors-set. (report [A,B] not [A] + [A,B]) | |
660 |
|
660 | |||
661 | $ newcase subset |
|
661 | $ newcase subset | |
662 | $ hg debugobsolete `getid A_0` `getid A_2` |
|
662 | $ hg debugobsolete `getid A_0` `getid A_2` | |
663 | obsoleted 1 changesets |
|
663 | obsoleted 1 changesets | |
664 | $ hg debugobsolete `getid A_0` `getid A_1` `getid A_2` |
|
664 | $ hg debugobsolete `getid A_0` `getid A_1` `getid A_2` | |
665 | $ hg debugsuccessorssets --hidden 'desc('A_0')' |
|
665 | $ hg debugsuccessorssets --hidden 'desc('A_0')' | |
666 | 007dc284c1f8 |
|
666 | 007dc284c1f8 | |
667 | 82623d38b9ba 392fd25390da |
|
667 | 82623d38b9ba 392fd25390da | |
668 | $ hg debugsuccessorssets 'desc('A_0')' --closest |
|
668 | $ hg debugsuccessorssets 'desc('A_0')' --closest | |
669 | $ hg debugsuccessorssets 'desc('A_0')' --closest --hidden |
|
669 | $ hg debugsuccessorssets 'desc('A_0')' --closest --hidden | |
670 | 007dc284c1f8 |
|
670 | 007dc284c1f8 | |
671 | 82623d38b9ba 392fd25390da |
|
671 | 82623d38b9ba 392fd25390da | |
672 |
|
672 | |||
673 | $ cd .. |
|
673 | $ cd .. | |
674 |
|
674 | |||
675 | Use scmutil.cleanupnodes API to create divergence |
|
675 | Use scmutil.cleanupnodes API to create divergence | |
676 |
|
676 | |||
677 | $ hg init cleanupnodes |
|
677 | $ hg init cleanupnodes | |
678 | $ cd cleanupnodes |
|
678 | $ cd cleanupnodes | |
679 | $ hg debugdrawdag <<'EOS' |
|
679 | $ hg debugdrawdag <<'EOS' | |
680 | > B1 B3 B4 |
|
680 | > B1 B3 B4 | |
681 | > | \| |
|
681 | > | \| | |
682 | > A Z |
|
682 | > A Z | |
683 | > EOS |
|
683 | > EOS | |
684 |
|
684 | |||
685 | $ hg update -q B1 |
|
685 | $ hg update -q B1 | |
686 | $ echo 3 >> B |
|
686 | $ echo 3 >> B | |
687 | $ hg commit --amend -m B2 |
|
687 | $ hg commit --amend -m B2 | |
688 | $ cat > $TESTTMP/scmutilcleanup.py <<EOF |
|
688 | $ cat > $TESTTMP/scmutilcleanup.py <<EOF | |
689 | > from mercurial import registrar, scmutil |
|
689 | > from mercurial import registrar, scmutil | |
690 | > cmdtable = {} |
|
690 | > cmdtable = {} | |
691 | > command = registrar.command(cmdtable) |
|
691 | > command = registrar.command(cmdtable) | |
692 | > @command('cleanup') |
|
692 | > @command('cleanup') | |
693 | > def cleanup(ui, repo): |
|
693 | > def cleanup(ui, repo): | |
694 | > def node(expr): |
|
694 | > def node(expr): | |
695 | > unfi = repo.unfiltered() |
|
695 | > unfi = repo.unfiltered() | |
696 | > rev = unfi.revs(expr).first() |
|
696 | > rev = unfi.revs(expr).first() | |
697 | > return unfi.changelog.node(rev) |
|
697 | > return unfi.changelog.node(rev) | |
698 | > with repo.wlock(), repo.lock(), repo.transaction('delayedstrip'): |
|
698 | > with repo.wlock(), repo.lock(), repo.transaction('delayedstrip'): | |
699 | > mapping = {node('desc(B1)'): [node('desc(B3)')], |
|
699 | > mapping = {node('desc(B1)'): [node('desc(B3)')], | |
700 | > node('desc(B3)'): [node('desc(B4)')]} |
|
700 | > node('desc(B3)'): [node('desc(B4)')]} | |
701 | > scmutil.cleanupnodes(repo, mapping, 'test') |
|
701 | > scmutil.cleanupnodes(repo, mapping, 'test') | |
702 | > EOF |
|
702 | > EOF | |
703 |
|
703 | |||
704 | $ rm .hg/localtags |
|
704 | $ rm .hg/localtags | |
705 | $ hg cleanup --config extensions.t=$TESTTMP/scmutilcleanup.py |
|
705 | $ hg cleanup --config extensions.t=$TESTTMP/scmutilcleanup.py | |
706 | 2 new content-divergent changesets |
|
706 | 2 new content-divergent changesets | |
707 | $ hg log -G -T '{rev}:{node|short} {desc} {instabilities}' -r 'sort(all(), topo)' |
|
707 | $ hg log -G -T '{rev}:{node|short} {desc} {instabilities}' -r 'sort(all(), topo)' | |
708 | @ 5:1a2a9b5b0030 B2 content-divergent |
|
708 | @ 5:1a2a9b5b0030 B2 content-divergent | |
709 | | |
|
709 | | | |
710 | | * 4:70d5a63ca112 B4 content-divergent |
|
710 | | * 4:70d5a63ca112 B4 content-divergent | |
711 | | | |
|
711 | | | | |
712 | | o 1:48b9aae0607f Z |
|
712 | | o 1:48b9aae0607f Z | |
713 | | |
|
713 | | | |
714 | o 0:426bada5c675 A |
|
714 | o 0:426bada5c675 A | |
715 |
|
715 | |||
716 | $ hg debugobsolete |
|
716 | $ hg debugobsolete | |
717 | a178212c3433c4e77b573f6011e29affb8aefa33 1a2a9b5b0030632400aa78e00388c20f99d3ec44 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} |
|
717 | a178212c3433c4e77b573f6011e29affb8aefa33 1a2a9b5b0030632400aa78e00388c20f99d3ec44 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} | |
718 | a178212c3433c4e77b573f6011e29affb8aefa33 ad6478fb94ecec98b86daae98722865d494ac561 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'test', 'user': 'test'} |
|
718 | a178212c3433c4e77b573f6011e29affb8aefa33 ad6478fb94ecec98b86daae98722865d494ac561 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'test', 'user': 'test'} | |
719 | ad6478fb94ecec98b86daae98722865d494ac561 70d5a63ca112acb3764bc1d7320ca90ea688d671 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'test', 'user': 'test'} |
|
719 | ad6478fb94ecec98b86daae98722865d494ac561 70d5a63ca112acb3764bc1d7320ca90ea688d671 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'test', 'user': 'test'} | |
720 |
|
720 | |||
721 | $ hg debugwhyunstable 1a2a9b5b0030 |
|
721 | $ hg debugwhyunstable 1a2a9b5b0030 | |
722 | content-divergent: 70d5a63ca112acb3764bc1d7320ca90ea688d671 (draft) predecessor a178212c3433c4e77b573f6011e29affb8aefa33 |
|
722 | content-divergent: 70d5a63ca112acb3764bc1d7320ca90ea688d671 (draft) predecessor a178212c3433c4e77b573f6011e29affb8aefa33 | |
723 |
|
723 | |||
724 |
$ hg log -r 1a2a9b5b0030 |
|
724 | $ hg log -r 1a2a9b5b0030 -T '{whyunstable}\n' | |
725 | content-divergent: 4:70d5a63ca112 (draft) predecessor a178212c3433 |
|
725 | content-divergent: 4:70d5a63ca112 (draft) predecessor a178212c3433 | |
726 |
$ hg log -r 1a2a9b5b0030 |
|
726 | $ hg log -r 1a2a9b5b0030 -T '{whyunstable%"{instability}:{divergentnodes} {reason} {node}\n"}' | |
727 | content-divergent: 4:70d5a63ca112 (draft) predecessor a178212c3433c4e77b573f6011e29affb8aefa33 |
|
727 | content-divergent: 4:70d5a63ca112 (draft) predecessor a178212c3433c4e77b573f6011e29affb8aefa33 | |
728 |
$ hg log -r 1a2a9b5b0030 |
|
728 | $ hg log -r 1a2a9b5b0030 -T '{whyunstable%"{instability}:{divergentnodes % " {node} ({phase})"} {reason} {node}\n"}' | |
729 | content-divergent: 70d5a63ca112acb3764bc1d7320ca90ea688d671 (draft) predecessor a178212c3433c4e77b573f6011e29affb8aefa33 |
|
729 | content-divergent: 70d5a63ca112acb3764bc1d7320ca90ea688d671 (draft) predecessor a178212c3433c4e77b573f6011e29affb8aefa33 | |
730 |
|
730 | |||
731 | #if serve |
|
731 | #if serve | |
732 |
|
732 | |||
733 | $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
|
733 | $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log | |
734 | $ cat hg.pid >> $DAEMON_PIDS |
|
734 | $ cat hg.pid >> $DAEMON_PIDS | |
735 |
|
735 | |||
736 | check explanation for a content-divergent changeset |
|
736 | check explanation for a content-divergent changeset | |
737 |
|
737 | |||
738 | $ get-with-headers.py localhost:$HGPORT 'rev/1a2a9b5b0030?style=paper' | grep divergent: |
|
738 | $ get-with-headers.py localhost:$HGPORT 'rev/1a2a9b5b0030?style=paper' | grep divergent: | |
739 | <td>content-divergent: <a href="/rev/70d5a63ca112?style=paper">70d5a63ca112</a> (draft) predecessor <a href="/rev/a178212c3433?style=paper">a178212c3433</a></td> |
|
739 | <td>content-divergent: <a href="/rev/70d5a63ca112?style=paper">70d5a63ca112</a> (draft) predecessor <a href="/rev/a178212c3433?style=paper">a178212c3433</a></td> | |
740 | $ get-with-headers.py localhost:$HGPORT 'rev/1a2a9b5b0030?style=coal' | grep divergent: |
|
740 | $ get-with-headers.py localhost:$HGPORT 'rev/1a2a9b5b0030?style=coal' | grep divergent: | |
741 | <td>content-divergent: <a href="/rev/70d5a63ca112?style=coal">70d5a63ca112</a> (draft) predecessor <a href="/rev/a178212c3433?style=coal">a178212c3433</a></td> |
|
741 | <td>content-divergent: <a href="/rev/70d5a63ca112?style=coal">70d5a63ca112</a> (draft) predecessor <a href="/rev/a178212c3433?style=coal">a178212c3433</a></td> | |
742 | $ get-with-headers.py localhost:$HGPORT 'rev/1a2a9b5b0030?style=gitweb' | grep divergent: |
|
742 | $ get-with-headers.py localhost:$HGPORT 'rev/1a2a9b5b0030?style=gitweb' | grep divergent: | |
743 | <td>content-divergent: <a class="list" href="/rev/70d5a63ca112?style=gitweb">70d5a63ca112</a> (draft) predecessor <a class="list" href="/rev/a178212c3433?style=gitweb">a178212c3433</a></td> |
|
743 | <td>content-divergent: <a class="list" href="/rev/70d5a63ca112?style=gitweb">70d5a63ca112</a> (draft) predecessor <a class="list" href="/rev/a178212c3433?style=gitweb">a178212c3433</a></td> | |
744 | $ get-with-headers.py localhost:$HGPORT 'rev/1a2a9b5b0030?style=monoblue' | grep divergent: |
|
744 | $ get-with-headers.py localhost:$HGPORT 'rev/1a2a9b5b0030?style=monoblue' | grep divergent: | |
745 | <dd>content-divergent: <a href="/rev/70d5a63ca112?style=monoblue">70d5a63ca112</a> (draft) predecessor <a href="/rev/a178212c3433?style=monoblue">a178212c3433</a></dd> |
|
745 | <dd>content-divergent: <a href="/rev/70d5a63ca112?style=monoblue">70d5a63ca112</a> (draft) predecessor <a href="/rev/a178212c3433?style=monoblue">a178212c3433</a></dd> | |
746 | $ get-with-headers.py localhost:$HGPORT 'rev/1a2a9b5b0030?style=spartan' | grep divergent: |
|
746 | $ get-with-headers.py localhost:$HGPORT 'rev/1a2a9b5b0030?style=spartan' | grep divergent: | |
747 | <td class="unstable">content-divergent: <a href="/rev/70d5a63ca112?style=spartan">70d5a63ca112</a> (draft) predecessor <a href="/rev/a178212c3433?style=spartan">a178212c3433</a></td> |
|
747 | <td class="unstable">content-divergent: <a href="/rev/70d5a63ca112?style=spartan">70d5a63ca112</a> (draft) predecessor <a href="/rev/a178212c3433?style=spartan">a178212c3433</a></td> | |
748 |
|
748 | |||
749 | $ killdaemons.py |
|
749 | $ killdaemons.py | |
750 |
|
750 | |||
751 | #endif |
|
751 | #endif |
General Comments 0
You need to be logged in to leave comments.
Login now