Mercurial > evolve
comparison tests/test-stabilize-result.t @ 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 | 61d073590fb7 |
children | cbc7a69116bd |
comparison
equal
deleted
inserted
replaced
2576:bfc563aaac2a | 2577:5506b463bddc |
---|---|
1 $ cat >> $HGRCPATH <<EOF | 1 $ cat >> $HGRCPATH <<EOF |
2 > [defaults] | 2 > [defaults] |
3 > amend=-d "0 0" | 3 > amend=-d "0 0" |
4 > [experimental] | |
5 > evolution.effect-flags = yes | |
4 > [extensions] | 6 > [extensions] |
5 > hgext.rebase= | 7 > hgext.rebase= |
6 > hgext.graphlog= | 8 > hgext.graphlog= |
7 > EOF | 9 > EOF |
8 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH | 10 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
51 | x 1:102a90ea7b4a@default(draft) bk:[] addb | 53 | x 1:102a90ea7b4a@default(draft) bk:[] addb |
52 |/ | 54 |/ |
53 o 0:07f494440405@default(draft) bk:[] adda | 55 o 0:07f494440405@default(draft) bk:[] adda |
54 | 56 |
55 $ hg debugobsolete | 57 $ hg debugobsolete |
56 102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 (*) {'user': 'test'} (glob) | 58 102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
57 c5727dbded3c3a6877cf60d6bb552a76812cb844 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (*) {'user': 'test'} (glob) | 59 c5727dbded3c3a6877cf60d6bb552a76812cb844 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (*) {'ef1': '*', 'user': 'test'} (glob) |
58 cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (*) {'user': 'test'} (glob) | 60 cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (*) {'ef1': '*', 'user': 'test'} (glob) |
59 | 61 |
60 Test evolve with conflict | 62 Test evolve with conflict |
61 | 63 |
62 $ ls | 64 $ ls |
63 a | 65 a |