equal
deleted
inserted
replaced
1 $ "$TESTDIR/hghave" serve || exit 80 |
1 $ "$TESTDIR/hghave" serve || exit 80 |
2 |
2 |
3 $ cat << EOF >> $HGRCPATH |
3 $ cat << EOF >> $HGRCPATH |
|
4 > [ui] |
|
5 > logtemplate={rev}:{node|short} {desc|firstline} |
4 > [phases] |
6 > [phases] |
5 > publish=False |
7 > publish=False |
6 > [extensions] |
8 > [extensions] |
7 > EOF |
9 > EOF |
8 $ cat > obs.py << EOF |
10 $ cat > obs.py << EOF |
195 $ hg up -q 4e3505fd9583 |
197 $ hg up -q 4e3505fd9583 |
196 $ echo c4 > f2 |
198 $ echo c4 > f2 |
197 $ hg ci -Am4 |
199 $ hg ci -Am4 |
198 adding f2 |
200 adding f2 |
199 created new head |
201 created new head |
|
202 $ echo c5 > f2 |
|
203 $ hg ci -Am5 |
|
204 $ hg log -G |
|
205 @ 5:c922c0139ca0 5 |
|
206 | |
|
207 o 4:4efff6d98829 4 |
|
208 | |
|
209 | o 3:f6fc62dde3c0 3 |
|
210 |/ |
|
211 | o 2:0d2164f0ce0d 1 |
|
212 |/ |
|
213 | o 1:9b140be10808 2 |
|
214 |/ |
|
215 o 0:4e3505fd9583 test |
|
216 |
|
217 |
200 $ hg book -f Y |
218 $ hg book -f Y |
201 |
219 |
202 $ cat <<EOF > ../a/.hg/hgrc |
220 $ cat <<EOF > ../a/.hg/hgrc |
203 > [web] |
221 > [web] |
204 > push_ssl = false |
222 > push_ssl = false |
209 $ cat ../hg2.pid >> $DAEMON_PIDS |
227 $ cat ../hg2.pid >> $DAEMON_PIDS |
210 |
228 |
211 $ hg push http://localhost:$HGPORT2/ |
229 $ hg push http://localhost:$HGPORT2/ |
212 pushing to http://localhost:$HGPORT2/ |
230 pushing to http://localhost:$HGPORT2/ |
213 searching for changes |
231 searching for changes |
214 abort: push creates new remote head 4efff6d98829! |
232 abort: push creates new remote head c922c0139ca0! |
215 (did you forget to merge? use push -f to force) |
233 (did you forget to merge? use push -f to force) |
216 [255] |
234 [255] |
217 $ hg -R ../a book |
235 $ hg -R ../a book |
218 @ 1:0d2164f0ce0d |
236 @ 1:0d2164f0ce0d |
219 * X 1:0d2164f0ce0d |
237 * X 1:0d2164f0ce0d |
225 |
243 |
226 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb |
244 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb |
227 $ hg push http://localhost:$HGPORT2/ |
245 $ hg push http://localhost:$HGPORT2/ |
228 pushing to http://localhost:$HGPORT2/ |
246 pushing to http://localhost:$HGPORT2/ |
229 searching for changes |
247 searching for changes |
230 abort: push creates new remote head 4efff6d98829! |
248 abort: push creates new remote head c922c0139ca0! |
231 (did you forget to merge? use push -f to force) |
249 (did you forget to merge? use push -f to force) |
232 [255] |
250 [255] |
233 $ hg -R ../a book |
251 $ hg -R ../a book |
234 @ 1:0d2164f0ce0d |
252 @ 1:0d2164f0ce0d |
235 * X 1:0d2164f0ce0d |
253 * X 1:0d2164f0ce0d |
239 Update to a successor works |
257 Update to a successor works |
240 |
258 |
241 $ hg id --debug -r 3 |
259 $ hg id --debug -r 3 |
242 f6fc62dde3c0771e29704af56ba4d8af77abcc2f |
260 f6fc62dde3c0771e29704af56ba4d8af77abcc2f |
243 $ hg id --debug -r 4 |
261 $ hg id --debug -r 4 |
244 4efff6d98829d9c824c621afd6e3f01865f5439f tip Y |
262 4efff6d98829d9c824c621afd6e3f01865f5439f |
|
263 $ hg id --debug -r 5 |
|
264 c922c0139ca03858f655e4a2af4dd02796a63969 tip Y |
245 $ hg debugobsolete f6fc62dde3c0771e29704af56ba4d8af77abcc2f 4efff6d98829d9c824c621afd6e3f01865f5439f |
265 $ hg debugobsolete f6fc62dde3c0771e29704af56ba4d8af77abcc2f 4efff6d98829d9c824c621afd6e3f01865f5439f |
246 $ hg push http://localhost:$HGPORT2/ |
266 $ hg push http://localhost:$HGPORT2/ |
247 pushing to http://localhost:$HGPORT2/ |
267 pushing to http://localhost:$HGPORT2/ |
248 searching for changes |
268 searching for changes |
249 remote: adding changesets |
269 remote: adding changesets |
250 remote: adding manifests |
270 remote: adding manifests |
251 remote: adding file changes |
271 remote: adding file changes |
252 remote: added 1 changesets with 1 changes to 1 files (+1 heads) |
272 remote: added 2 changesets with 2 changes to 1 files (+1 heads) |
253 updating bookmark Y |
273 updating bookmark Y |
254 $ hg -R ../a book |
274 $ hg -R ../a book |
255 @ 1:0d2164f0ce0d |
275 @ 1:0d2164f0ce0d |
256 * X 1:0d2164f0ce0d |
276 * X 1:0d2164f0ce0d |
257 Y 4:4efff6d98829 |
277 Y 5:c922c0139ca0 |
258 Z 1:0d2164f0ce0d |
278 Z 1:0d2164f0ce0d |
259 |
279 |
260 hgweb |
280 hgweb |
261 |
281 |
262 $ cat <<EOF > .hg/hgrc |
282 $ cat <<EOF > .hg/hgrc |
276 obsolete |
296 obsolete |
277 $ hg debugpushkey http://localhost:$HGPORT/ bookmarks |
297 $ hg debugpushkey http://localhost:$HGPORT/ bookmarks |
278 @ 9b140be1080824d768c5a4691a564088eede71f9 |
298 @ 9b140be1080824d768c5a4691a564088eede71f9 |
279 foo 0000000000000000000000000000000000000000 |
299 foo 0000000000000000000000000000000000000000 |
280 foobar 9b140be1080824d768c5a4691a564088eede71f9 |
300 foobar 9b140be1080824d768c5a4691a564088eede71f9 |
281 Y 4efff6d98829d9c824c621afd6e3f01865f5439f |
301 Y c922c0139ca03858f655e4a2af4dd02796a63969 |
282 X 9b140be1080824d768c5a4691a564088eede71f9 |
302 X 9b140be1080824d768c5a4691a564088eede71f9 |
283 Z 0d2164f0ce0d8f1d6f94351eba04b794909be66c |
303 Z 0d2164f0ce0d8f1d6f94351eba04b794909be66c |
284 $ hg out -B http://localhost:$HGPORT/ |
304 $ hg out -B http://localhost:$HGPORT/ |
285 comparing with http://localhost:$HGPORT/ |
305 comparing with http://localhost:$HGPORT/ |
286 searching for changed bookmarks |
306 searching for changed bookmarks |
311 $ hg clone http://localhost:$HGPORT/ cloned-bookmarks |
331 $ hg clone http://localhost:$HGPORT/ cloned-bookmarks |
312 requesting all changes |
332 requesting all changes |
313 adding changesets |
333 adding changesets |
314 adding manifests |
334 adding manifests |
315 adding file changes |
335 adding file changes |
316 added 4 changesets with 4 changes to 3 files (+2 heads) |
336 added 5 changesets with 5 changes to 3 files (+2 heads) |
317 updating to branch default |
337 updating to branch default |
318 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
338 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
319 $ hg -R cloned-bookmarks bookmarks |
339 $ hg -R cloned-bookmarks bookmarks |
320 @ 1:9b140be10808 |
340 @ 1:9b140be10808 |
321 X 1:9b140be10808 |
341 X 1:9b140be10808 |
322 Y 3:4efff6d98829 |
342 Y 4:c922c0139ca0 |
323 Z 2:0d2164f0ce0d |
343 Z 2:0d2164f0ce0d |
324 foo -1:000000000000 |
344 foo -1:000000000000 |
325 foobar 1:9b140be10808 |
345 foobar 1:9b140be10808 |
326 |
346 |
327 $ cd .. |
347 $ cd .. |
331 $ hg clone http://localhost:$HGPORT/ addmarks |
351 $ hg clone http://localhost:$HGPORT/ addmarks |
332 requesting all changes |
352 requesting all changes |
333 adding changesets |
353 adding changesets |
334 adding manifests |
354 adding manifests |
335 adding file changes |
355 adding file changes |
336 added 4 changesets with 4 changes to 3 files (+2 heads) |
356 added 5 changesets with 5 changes to 3 files (+2 heads) |
337 updating to branch default |
357 updating to branch default |
338 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
358 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
339 $ cd addmarks |
359 $ cd addmarks |
340 $ echo foo > foo |
360 $ echo foo > foo |
341 $ hg add foo |
361 $ hg add foo |