Show More
@@ -4,6 +4,10 b'' | |||||
4 | > publish=false |
|
4 | > publish=false | |
5 | > [ui] |
|
5 | > [ui] | |
6 | > logtemplate="{rev}:{node|short} ({phase}) [{tags} {bookmarks}] {desc|firstline}\n" |
|
6 | > logtemplate="{rev}:{node|short} ({phase}) [{tags} {bookmarks}] {desc|firstline}\n" | |
|
7 | > [experimental] | |||
|
8 | > # drop me once bundle2 is the default, | |||
|
9 | > # added to get test change early. | |||
|
10 | > bundle2-exp = True | |||
7 | > EOF |
|
11 | > EOF | |
8 | $ mkcommit() { |
|
12 | $ mkcommit() { | |
9 | > echo "$1" > "$1" |
|
13 | > echo "$1" > "$1" | |
@@ -307,6 +311,7 b' Try to pull markers' | |||||
307 | adding manifests |
|
311 | adding manifests | |
308 | adding file changes |
|
312 | adding file changes | |
309 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
313 | added 4 changesets with 4 changes to 4 files (+1 heads) | |
|
314 | 5 new obsolescence markers | |||
310 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
315 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
311 | $ hg debugobsolete |
|
316 | $ hg debugobsolete | |
312 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
317 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
@@ -348,6 +353,7 b' Try to push markers' | |||||
348 | adding manifests |
|
353 | adding manifests | |
349 | adding file changes |
|
354 | adding file changes | |
350 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
355 | added 4 changesets with 4 changes to 4 files (+1 heads) | |
|
356 | 5 new obsolescence markers | |||
351 | $ hg -R tmpd debugobsolete | sort |
|
357 | $ hg -R tmpd debugobsolete | sort | |
352 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
358 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
353 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
359 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
@@ -410,6 +416,7 b' On pull' | |||||
410 | adding manifests |
|
416 | adding manifests | |
411 | adding file changes |
|
417 | adding file changes | |
412 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
418 | added 4 changesets with 4 changes to 4 files (+1 heads) | |
|
419 | 5 new obsolescence markers | |||
413 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
420 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
414 | $ hg debugobsolete |
|
421 | $ hg debugobsolete | |
415 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
422 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
@@ -426,6 +433,7 b' On push' | |||||
426 | pushing to ../tmpc |
|
433 | pushing to ../tmpc | |
427 | searching for changes |
|
434 | searching for changes | |
428 | no changes found |
|
435 | no changes found | |
|
436 | 1 new obsolescence markers | |||
429 | [1] |
|
437 | [1] | |
430 | $ hg -R ../tmpc debugobsolete |
|
438 | $ hg -R ../tmpc debugobsolete | |
431 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
439 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
@@ -508,6 +516,7 b" Don't try to push extinct changeset" | |||||
508 | adding manifests |
|
516 | adding manifests | |
509 | adding file changes |
|
517 | adding file changes | |
510 | added 6 changesets with 6 changes to 6 files (+1 heads) |
|
518 | added 6 changesets with 6 changes to 6 files (+1 heads) | |
|
519 | 7 new obsolescence markers | |||
511 |
|
520 | |||
512 | no warning displayed |
|
521 | no warning displayed | |
513 |
|
522 | |||
@@ -547,6 +556,7 b' Do not warn about new head when the new ' | |||||
547 | adding manifests |
|
556 | adding manifests | |
548 | adding file changes |
|
557 | adding file changes | |
549 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
558 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
559 | 1 new obsolescence markers | |||
550 |
|
560 | |||
551 | test relevance computation |
|
561 | test relevance computation | |
552 | --------------------------------------- |
|
562 | --------------------------------------- | |
@@ -764,6 +774,7 b' This test issue 3814' | |||||
764 | adding manifests |
|
774 | adding manifests | |
765 | adding file changes |
|
775 | adding file changes | |
766 | added 1 changesets with 1 changes to 1 files |
|
776 | added 1 changesets with 1 changes to 1 files | |
|
777 | 2 new obsolescence markers | |||
767 | $ hg out ../repo-issue3814 |
|
778 | $ hg out ../repo-issue3814 | |
768 | comparing with ../repo-issue3814 |
|
779 | comparing with ../repo-issue3814 | |
769 | searching for changes |
|
780 | searching for changes |
General Comments 0
You need to be logged in to leave comments.
Login now