1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865
|
$ cat >> $HGRCPATH << EOF
> [extensions]
> fastexport=
> EOF
$ hg init
$ hg debugbuilddag -mon '+2:tbase @name1 +3:thead1 <tbase @name2 +4:thead2 @both /thead1 +2:tmaintip'
$ hg up -r 10
13 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg rm nf10
$ hg commit -u debugbuilddag --date 'Thu Jan 01 02:30:12 1970 +0230' -m r12
created new head
$ hg up -r 11
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge -r 12
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg commit -m debugbuilddag --date 'Thu Jan 01 00:00:13 1970 +0000'
$ hg log -G
@ changeset: 13:5544befcb7ce
|\ branch: both
| | tag: tip
| | parent: 11:2cbd52c10e88
| | parent: 12:66d0c21243be
| | user: test
| | date: Thu Jan 01 00:00:13 1970 +0000
| | summary: debugbuilddag
| |
| o changeset: 12:66d0c21243be
| | branch: both
| | parent: 10:9220596cb068
| | user: debugbuilddag
| | date: Thu Jan 01 02:30:12 1970 +0230
| | summary: r12
| |
o | changeset: 11:2cbd52c10e88
|/ branch: both
| tag: tmaintip
| user: debugbuilddag
| date: Thu Jan 01 00:00:11 1970 +0000
| summary: r11
|
o changeset: 10:9220596cb068
| branch: both
| user: debugbuilddag
| date: Thu Jan 01 00:00:10 1970 +0000
| summary: r10
|
o changeset: 9:0767d147d86e
|\ branch: both
| | parent: 8:0d0219415f18
| | parent: 4:e8bc3a6ab9ae
| | user: debugbuilddag
| | date: Thu Jan 01 00:00:09 1970 +0000
| | summary: r9
| |
| o changeset: 8:0d0219415f18
| | branch: name2
| | tag: thead2
| | user: debugbuilddag
| | date: Thu Jan 01 00:00:08 1970 +0000
| | summary: r8
| |
| o changeset: 7:82c6c8b3ac68
| | branch: name2
| | user: debugbuilddag
| | date: Thu Jan 01 00:00:07 1970 +0000
| | summary: r7
| |
| o changeset: 6:94093a13175f
| | branch: name2
| | user: debugbuilddag
| | date: Thu Jan 01 00:00:06 1970 +0000
| | summary: r6
| |
| o changeset: 5:4baee2f72e9e
| | branch: name2
| | parent: 1:bf4022f1addd
| | user: debugbuilddag
| | date: Thu Jan 01 00:00:05 1970 +0000
| | summary: r5
| |
o | changeset: 4:e8bc3a6ab9ae
| | branch: name1
| | tag: thead1
| | user: debugbuilddag
| | date: Thu Jan 01 00:00:04 1970 +0000
| | summary: r4
| |
o | changeset: 3:46148e496a8a
| | branch: name1
| | user: debugbuilddag
| | date: Thu Jan 01 00:00:03 1970 +0000
| | summary: r3
| |
o | changeset: 2:29863c4219cd
|/ branch: name1
| user: debugbuilddag
| date: Thu Jan 01 00:00:02 1970 +0000
| summary: r2
|
o changeset: 1:bf4022f1addd
| tag: tbase
| user: debugbuilddag
| date: Thu Jan 01 00:00:01 1970 +0000
| summary: r1
|
o changeset: 0:ae6ae30a671b
user: debugbuilddag
date: Thu Jan 01 00:00:00 1970 +0000
summary: r0
$ hg fastexport --export-marks fastexport.marks
blob
mark :1
data 65
0 r0
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
blob
mark :2
data 3
r0
commit refs/heads/default
mark :3
committer "debugbuilddag" <debugbuilddag> 0 +0000
data 2
r0
M 644 :1 mf
M 644 :2 nf0
M 644 :2 of
blob
mark :4
data 68
0 r0
1
2 r1
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
blob
mark :5
data 3
r1
blob
mark :6
data 3
r1
commit refs/heads/default
mark :7
committer "debugbuilddag" <debugbuilddag> 1 +0000
data 2
r1
from :3
M 644 :4 mf
M 644 :5 nf1
M 644 :6 of
blob
mark :8
data 71
0 r0
1
2 r1
3
4 r2
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
blob
mark :9
data 3
r2
blob
mark :10
data 3
r2
commit refs/heads/name1
mark :11
committer "debugbuilddag" <debugbuilddag> 2 +0000
data 2
r2
from :7
M 644 :8 mf
M 644 :9 nf2
M 644 :10 of
blob
mark :12
data 74
0 r0
1
2 r1
3
4 r2
5
6 r3
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
blob
mark :13
data 3
r3
blob
mark :14
data 3
r3
commit refs/heads/name1
mark :15
committer "debugbuilddag" <debugbuilddag> 3 +0000
data 2
r3
from :11
M 644 :12 mf
M 644 :13 nf3
M 644 :14 of
blob
mark :16
data 77
0 r0
1
2 r1
3
4 r2
5
6 r3
7
8 r4
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
blob
mark :17
data 3
r4
blob
mark :18
data 3
r4
commit refs/heads/name1
mark :19
committer "debugbuilddag" <debugbuilddag> 4 +0000
data 2
r4
from :15
M 644 :16 mf
M 644 :17 nf4
M 644 :18 of
blob
mark :20
data 71
0 r0
1
2 r1
3
4
5
6
7
8
9
10 r5
11
12
13
14
15
16
17
18
19
20
21
22
23
blob
mark :21
data 3
r5
blob
mark :22
data 3
r5
commit refs/heads/name2
mark :23
committer "debugbuilddag" <debugbuilddag> 5 +0000
data 2
r5
from :7
M 644 :20 mf
M 644 :21 nf5
M 644 :22 of
blob
mark :24
data 74
0 r0
1
2 r1
3
4
5
6
7
8
9
10 r5
11
12 r6
13
14
15
16
17
18
19
20
21
22
23
blob
mark :25
data 3
r6
blob
mark :26
data 3
r6
commit refs/heads/name2
mark :27
committer "debugbuilddag" <debugbuilddag> 6 +0000
data 2
r6
from :23
M 644 :24 mf
M 644 :25 nf6
M 644 :26 of
blob
mark :28
data 77
0 r0
1
2 r1
3
4
5
6
7
8
9
10 r5
11
12 r6
13
14 r7
15
16
17
18
19
20
21
22
23
blob
mark :29
data 3
r7
blob
mark :30
data 3
r7
commit refs/heads/name2
mark :31
committer "debugbuilddag" <debugbuilddag> 7 +0000
data 2
r7
from :27
M 644 :28 mf
M 644 :29 nf7
M 644 :30 of
blob
mark :32
data 80
0 r0
1
2 r1
3
4
5
6
7
8
9
10 r5
11
12 r6
13
14 r7
15
16 r8
17
18
19
20
21
22
23
blob
mark :33
data 3
r8
blob
mark :34
data 3
r8
commit refs/heads/name2
mark :35
committer "debugbuilddag" <debugbuilddag> 8 +0000
data 2
r8
from :31
M 644 :32 mf
M 644 :33 nf8
M 644 :34 of
blob
mark :36
data 92
0 r0
1
2 r1
3
4 r2
5
6 r3
7
8 r4
9
10 r5
11
12 r6
13
14 r7
15
16 r8
17
18 r9
19
20
21
22
23
blob
mark :37
data 3
r9
blob
mark :38
data 3
r9
commit refs/heads/both
mark :39
committer "debugbuilddag" <debugbuilddag> 9 +0000
data 2
r9
from :35
merge :19
M 644 :36 mf
M 644 :9 nf2
M 644 :13 nf3
M 644 :17 nf4
M 644 :37 nf9
M 644 :38 of
blob
mark :40
data 96
0 r0
1
2 r1
3
4 r2
5
6 r3
7
8 r4
9
10 r5
11
12 r6
13
14 r7
15
16 r8
17
18 r9
19
20 r10
21
22
23
blob
mark :41
data 4
r10
blob
mark :42
data 4
r10
commit refs/heads/both
mark :43
committer "debugbuilddag" <debugbuilddag> 10 +0000
data 3
r10
from :39
M 644 :40 mf
M 644 :41 nf10
M 644 :42 of
blob
mark :44
data 100
0 r0
1
2 r1
3
4 r2
5
6 r3
7
8 r4
9
10 r5
11
12 r6
13
14 r7
15
16 r8
17
18 r9
19
20 r10
21
22 r11
23
blob
mark :45
data 4
r11
blob
mark :46
data 4
r11
commit refs/heads/both
mark :47
committer "debugbuilddag" <debugbuilddag> 11 +0000
data 3
r11
from :43
M 644 :44 mf
M 644 :45 nf11
M 644 :46 of
commit refs/heads/both
mark :48
committer "debugbuilddag" <debugbuilddag> 12 +0230
data 3
r12
from :43
D nf10
commit refs/heads/both
mark :49
committer "test" <test> 13 +0000
data 13
debugbuilddag
from :47
merge :48
D nf10
$ cat fastexport.marks
e1767c7564f83127d75331428473dd0512b36cc6
2c436e3f677d989438ddd9a7e5e4d56e016dfd35
ae6ae30a671be09096aaaf51217b3691eec0eee0
016f8fd6128ac4bd19ec5a6ae128dadc3873b13f
a0e6fc91007068df3bc60f46ce0a893a73189b54
1a085e1daf625e186ee0064c64ff41731a901f24
bf4022f1addd28523fb1122ac6166a29da58d34c
2c45ad1c720111830380baa89a6a16cae1bef688
180506669a19f4b8317009fc6fa0043966d1ffb4
1ebc486e6a5c2c8ca7e531cf0b63dfcc071ec324
29863c4219cd68e0f57aecd5ffc12ba83313f26b
d20e5eeac6991189eefad45cd8ea0f6a32ce8122
710c4580a600b8aadc63fa3d7bb0fab71b127c04
fa27314b56d7b6f90c1caeebb2a74730b3747574
46148e496a8a75fde9e203b1ded69ec99289af27
e5548c667d7eeb6c326e723c579888341329c9fe
3c1407305701051cbed9f9cb9a68bdfb5997c235
e2ed51893b0a54bd7fef5a406a0c489d668f19c3
e8bc3a6ab9aef589f5db504f401953449a3c3a10
558f3a23efc0a1a972e14d5314a65918791b77be
0dbd89c185f53a1727c54cd1ce256482fa23968e
f84faeb138605b36d74324c6d0ea76a9099c3567
4baee2f72e9eeae2aef5b9e1ec416020090672ef
412c5793886eaaabb31debd36695f6215a719865
a0eafc60760d32b690564b8588ba042cc63e0c74
a53842517de32d2f926c38a170c29dc90ae3348a
94093a13175f1cfcbbfddaa0ceafbd3a89784b91
d2f0d76af0be0da17ec88190215eadb8706689ab
639939af794373d6c2ab12c2ef637cd220174389
cc8921e2b19a88147643ea825459ffa140e3d704
82c6c8b3ac6873fadd9083323b02cc6a53659130
c6cc0b14a3e6e61906242d6fce28b9510c9f9208
093593169cb4716f94e52ed7561bb84b36b7eb9d
034df75dc138e7507e061d26170b4c44321a5d92
0d0219415f18c43636163fff4160f41600951a25
f13693f6e6052eeb189521945fef56892e812fdb
1239c633b8a7a7283825dba9171bf285e5790852
34b655bd51e8573b8e85c1c1476a94d8573babef
0767d147d86e1546593bda50f1e11276c0ac8f1a
284ca43bbbe82e89c0f1d977e8ac6cfb969c05ec
15315ab9e272ec81ae8d847996e5bdecd5635b0b
78c10aaf21f49d518c7ccb8318c29abb5d4e5db7
9220596cb068dfc73e2f7e695dc8ad0858a936db
32abd0da49b7c7ee756298fc46a15584d6aedc99
33fbc651630ffa7ccbebfe4eb91320a873e7291c
868d828870663d075cdcff502d26cf8445ce068e
2cbd52c10e88ce604402dc83a869ec4f07765b3d
66d0c21243be072f82ced64aa730ab0367252451
5544befcb7ce4a558ed9e19909e16af574a2a3c6
$ hg fastexport --export-marks fastexport.marks2 -r 0
blob
mark :1
data 65
0 r0
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
blob
mark :2
data 3
r0
commit refs/heads/default
mark :3
committer "debugbuilddag" <debugbuilddag> 0 +0000
data 2
r0
M 644 :1 mf
M 644 :2 nf0
M 644 :2 of
$ cat fastexport.marks2
e1767c7564f83127d75331428473dd0512b36cc6
2c436e3f677d989438ddd9a7e5e4d56e016dfd35
ae6ae30a671be09096aaaf51217b3691eec0eee0
$ hg fastexport --import-marks fastexport.marks2 -r 1
blob
mark :4
data 68
0 r0
1
2 r1
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
blob
mark :5
data 3
r1
blob
mark :6
data 3
r1
commit refs/heads/default
mark :7
committer "debugbuilddag" <debugbuilddag> 1 +0000
data 2
r1
from :3
M 644 :4 mf
M 644 :5 nf1
M 644 :6 of
$ echo foo > of
$ hg commit --user '<badname> <bad email>' --date 'Fri Jan 02 00:00:00 1970 +0000' -m 'Testcommit'
$ hg fastexport --import-marks fastexport.marks -r tip
blob
mark :50
data 4
foo
abort: Unable to parse user into person and email for revision 65a3f69b9b519de73d755472c1ab05990ab8a7f7
[255]
|