Mercurial > evolve
comparison tests/test-evolve-content-divergent-basic.t @ 5275:417503ef667d
tests: add debugobsolete calls before many obslog calls
As requested by Pierre-Yves. The main reason is to catch superfluous
creation of obsmarkers, as well as any future changes to how the
obsmarkers get created.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 16 Dec 2019 11:14:39 -0800 |
| parents | 900668a93629 |
| children | 304de9a04172 |
comparison
equal
deleted
inserted
replaced
| 5274:498dc888ff40 | 5275:417503ef667d |
|---|---|
| 893 content-divergent: 19ed1bf64a2c (draft) (precursor 4a250e5bd992) | 893 content-divergent: 19ed1bf64a2c (draft) (precursor 4a250e5bd992) |
| 894 | 894 |
| 895 19ed1bf64a2c: E3 | 895 19ed1bf64a2c: E3 |
| 896 content-divergent: 084ae625fa51 (draft) (precursor 4a250e5bd992) | 896 content-divergent: 084ae625fa51 (draft) (precursor 4a250e5bd992) |
| 897 | 897 |
| 898 $ hg debugobsolete | |
| 899 4a250e5bd992a897655e3b6f238e12452cf063e9 084ae625fa51ca8c441ba1d2bf0f974b21671017 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} | |
| 900 4a250e5bd992a897655e3b6f238e12452cf063e9 19ed1bf64a2cc2a824df5ac33a436eca1ae0475d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} | |
| 898 $ hg obslog --all --patch | 901 $ hg obslog --all --patch |
| 899 * 084ae625fa51 (2) E2 | 902 * 084ae625fa51 (2) E2 |
| 900 | | 903 | |
| 901 | @ 19ed1bf64a2c (3) E3 | 904 | @ 19ed1bf64a2c (3) E3 |
| 902 |/ | 905 |/ |
| 994 $ hg log -G | 997 $ hg log -G |
| 995 @ 5:8c2a6aae4bc5@default(draft) E4 [] | 998 @ 5:8c2a6aae4bc5@default(draft) E4 [] |
| 996 | | 999 | |
| 997 o 0:6d1fdf6de7e2@default(draft) root [] | 1000 o 0:6d1fdf6de7e2@default(draft) root [] |
| 998 | 1001 |
| 1002 $ hg debugobsolete | |
| 1003 4a250e5bd992a897655e3b6f238e12452cf063e9 084ae625fa51ca8c441ba1d2bf0f974b21671017 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} | |
| 1004 4a250e5bd992a897655e3b6f238e12452cf063e9 19ed1bf64a2cc2a824df5ac33a436eca1ae0475d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} | |
| 1005 084ae625fa51ca8c441ba1d2bf0f974b21671017 aae2930509804c5a84e559eb9d631abeb9c0a340 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'evolve', 'user': 'test'} | |
| 1006 19ed1bf64a2cc2a824df5ac33a436eca1ae0475d aae2930509804c5a84e559eb9d631abeb9c0a340 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'evolve', 'user': 'test'} | |
| 1007 aae2930509804c5a84e559eb9d631abeb9c0a340 8c2a6aae4bc5c1cc00c68276017dcef3d468e895 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} | |
| 999 $ hg obslog --patch | 1008 $ hg obslog --patch |
| 1000 @ 8c2a6aae4bc5 (5) E4 | 1009 @ 8c2a6aae4bc5 (5) E4 |
| 1001 | | 1010 | |
| 1002 x aae293050980 (4) <<<<<<< divergent | 1011 x aae293050980 (4) <<<<<<< divergent |
| 1003 |\ reworded(description) as 8c2a6aae4bc5 using amend by test (Thu Jan 01 00:00:00 1970 +0000) | 1012 |\ reworded(description) as 8c2a6aae4bc5 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |