Mercurial > evolve
changeset 2577:5506b463bddc
effectflag: activate effect flag on test-stabilize-result.t test file
Prepare activation of effect flag by default by activating it on test-
stabilize-result.t test file first.
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Sun, 04 Jun 2017 20:47:04 +0200 |
| parents | bfc563aaac2a |
| children | 7795a86ba326 |
| files | tests/test-stabilize-result.t |
| diffstat | 1 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-stabilize-result.t Sun Jun 04 20:43:22 2017 +0200 +++ b/tests/test-stabilize-result.t Sun Jun 04 20:47:04 2017 +0200 @@ -1,6 +1,8 @@ $ cat >> $HGRCPATH <<EOF > [defaults] > amend=-d "0 0" + > [experimental] + > evolution.effect-flags = yes > [extensions] > hgext.rebase= > hgext.graphlog= @@ -53,9 +55,9 @@ o 0:07f494440405@default(draft) bk:[] adda $ hg debugobsolete - 102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 (*) {'user': 'test'} (glob) - c5727dbded3c3a6877cf60d6bb552a76812cb844 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (*) {'user': 'test'} (glob) - cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (*) {'user': 'test'} (glob) + 102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 (*) {'ef1': '*', 'user': 'test'} (glob) + c5727dbded3c3a6877cf60d6bb552a76812cb844 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (*) {'ef1': '*', 'user': 'test'} (glob) + cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (*) {'ef1': '*', 'user': 'test'} (glob) Test evolve with conflict