Mercurial > evolve
diff tests/test-stabilize-result.t @ 3559:d166b3dc5e8a
tests: do not glob out fixed dates
Perhaps these dates historically have not been fixed, but they seem to
be now. I got tired of not being able to use "run-tests.py -i".
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 12 Mar 2018 23:26:25 -0700 |
parents | 14cd04ff968e |
children | fe16284cd95a |
line wrap: on
line diff
--- a/tests/test-stabilize-result.t Fri Mar 16 17:00:01 2018 +0530 +++ b/tests/test-stabilize-result.t Mon Mar 12 23:26:25 2018 -0700 @@ -50,8 +50,8 @@ o 0:07f494440405@default(draft) bk:[] adda $ hg debugobsolete - 102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 (*) {'ef1': '*', 'user': 'test'} (glob) - cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (*) {'ef1': '*', 'user': 'test'} (glob) + 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'} Test evolve with conflict @@ -60,8 +60,8 @@ b $ hg pdiff a diff -r 07f494440405 a - --- a/a * (glob) - +++ b/a * (glob) + --- a/a Thu Jan 01 00:00:00 1970 +0000 + +++ b/a Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +1,2 @@ a +a @@ -86,8 +86,8 @@ $ hg revert -r "orphan()" a $ hg diff diff -r 66719795a494 a - --- a/a * (glob) - +++ b/a * (glob) + --- a/a Thu Jan 01 00:00:00 1970 +0000 + +++ b/a Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +1,3 @@ a +a