Mercurial > evolve
comparison tests/test-stabilize-result.t @ 1067:5d063fed9e3d
evolve: yield to relevant markers handling in core
The handling of obsolescence marker is now performed in core. If we detect a
mercurial with such power we skip the wrapping from evolve.
This changeset also suffer from massive diff from the change in display of
obsolescence marker with parent information introduced at the same time in core.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Wed, 20 Aug 2014 20:49:48 -0700 |
| parents | f355bbc124fc |
| children | bac4e0bc9f6a |
comparison
equal
deleted
inserted
replaced
| 1066:045f7de9e4d3 | 1067:5d063fed9e3d |
|---|---|
| 46 |/ | 46 |/ |
| 47 o 0:07f494440405@default(draft) bk:[] adda | 47 o 0:07f494440405@default(draft) bk:[] adda |
| 48 | 48 |
| 49 $ hg debugobsolete | 49 $ hg debugobsolete |
| 50 102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 (*) {'user': 'test'} (glob) | 50 102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 (*) {'user': 'test'} (glob) |
| 51 c5727dbded3c3a6877cf60d6bb552a76812cb844 0 (*) {'p1': '102a90ea7b4a3361e4082ed620918c261189a36a', 'user': 'test'} (glob) | 51 c5727dbded3c3a6877cf60d6bb552a76812cb844 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (*) {'user': 'test'} (glob) |
| 52 cce2c55b896511e0b6e04173c9450ba822ebc740 0 (*) {'p1': '102a90ea7b4a3361e4082ed620918c261189a36a', 'user': 'test'} (glob) | 52 cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (*) {'user': 'test'} (glob) |
| 53 | 53 |
| 54 Test evolve with conflict | 54 Test evolve with conflict |
| 55 | 55 |
| 56 $ ls | 56 $ ls |
| 57 a | 57 a |