Mercurial > evolve
comparison tests/test-evolve.t @ 3561:4701e8888c4f
amend: include "operation" metadata in obsmarkers
This is for the legacy handling support for "hg commit --amend"
case. I picked "amend" because it feels more natural than
"commit". Besides, and more importantly, that's consistent what core
uses.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 12 Mar 2018 15:50:25 -0700 |
| parents | d166b3dc5e8a |
| children | 589649021ea1 |
comparison
equal
deleted
inserted
replaced
| 3560:f61a23a84dac | 3561:4701e8888c4f |
|---|---|
| 614 | o 1:73d38bb17fd7@default(draft) add 1 | 614 | o 1:73d38bb17fd7@default(draft) add 1 |
| 615 |/ | 615 |/ |
| 616 o 0:8685c6d34325@default(draft) add 0 | 616 o 0:8685c6d34325@default(draft) add 0 |
| 617 | 617 |
| 618 $ hg debugobsolete | 618 $ hg debugobsolete |
| 619 0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 0b9e50c35132ff548ec0065caea6a87e1ebcef32 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'user': 'test'} | 619 0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 0b9e50c35132ff548ec0065caea6a87e1ebcef32 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'amend', 'user': 'test'} |
| 620 db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'} | 620 db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'amend', 'user': 'test'} |
| 621 | 621 |
| 622 Test graft --continue | 622 Test graft --continue |
| 623 | 623 |
| 624 $ hg up -qC 0 | 624 $ hg up -qC 0 |
| 625 $ echo 2 > 1 | 625 $ echo 2 > 1 |
| 659 | o 1:73d38bb17fd7@default(draft) add 1 | 659 | o 1:73d38bb17fd7@default(draft) add 1 |
| 660 |/ | 660 |/ |
| 661 o 0:8685c6d34325@default(draft) add 0 | 661 o 0:8685c6d34325@default(draft) add 0 |
| 662 | 662 |
| 663 $ hg debugobsolete | 663 $ hg debugobsolete |
| 664 0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 0b9e50c35132ff548ec0065caea6a87e1ebcef32 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'user': 'test'} | 664 0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 0b9e50c35132ff548ec0065caea6a87e1ebcef32 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'amend', 'user': 'test'} |
| 665 db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'} | 665 db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'amend', 'user': 'test'} |
| 666 a5bfd90a2f29c7ccb8f917ff4e5013a9053d0a04 920e58bb443b73eea9d6d65570b4241051ea3229 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'user': 'test'} | 666 a5bfd90a2f29c7ccb8f917ff4e5013a9053d0a04 920e58bb443b73eea9d6d65570b4241051ea3229 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'amend', 'user': 'test'} |
| 667 | 667 |
| 668 Test touch | 668 Test touch |
| 669 | 669 |
| 670 $ glog | 670 $ glog |
| 671 @ 8:920e58bb443b@default(draft) conflict | 671 @ 8:920e58bb443b@default(draft) conflict |
| 784 1 successors: 10 | 784 1 successors: 10 |
| 785 2 successors: 0 | 785 2 successors: 0 |
| 786 more than 2 successors: 0 | 786 more than 2 successors: 0 |
| 787 available keys: | 787 available keys: |
| 788 ef1: 10 | 788 ef1: 10 |
| 789 operation: 3 | |
| 789 user: 10 | 790 user: 10 |
| 790 marker size: | 791 marker size: |
| 791 format v1: | 792 format v1: |
| 792 smallest length: 75 | 793 smallest length: 75 |
| 793 longer length: 76 | 794 longer length: 92 |
| 794 median length: 76 | 795 median length: 76 |
| 795 mean length: 75 | 796 mean length: 80 |
| 796 format v0: | 797 format v0: |
| 797 smallest length: * (glob) | 798 smallest length: * (glob) |
| 798 longer length: * (glob) | 799 longer length: * (glob) |
| 799 median length: * (glob) | 800 median length: * (glob) |
| 800 mean length: * (glob) | 801 mean length: * (glob) |