Mercurial > evolve
diff tests/test-stabilize-result.t @ 3562:fe16284cd95a
evolve: include "operation" metadata in obsmarkers
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 12 Mar 2018 15:40:28 -0700 |
parents | d166b3dc5e8a |
children | d5adce52cef4 db3ec5f79ab9 |
line wrap: on
line diff
--- a/tests/test-stabilize-result.t Mon Mar 12 15:50:25 2018 -0700 +++ b/tests/test-stabilize-result.t Mon Mar 12 15:40:28 2018 -0700 @@ -51,7 +51,7 @@ $ hg debugobsolete 102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} - cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} + cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} Test evolve with conflict