Mercurial > evolve
comparison tests/test-obsolete.t @ 1796:2be05515b142 mercurial-3.8
merge with 5.6.0
A minor one line conflict on test output were encountered.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Wed, 01 Feb 2017 15:32:59 +0100 |
| parents | e878999e6af4 e35667b01e1e |
| children | 4de90774eade ec04eb4d2c6e |
comparison
equal
deleted
inserted
replaced
| 1795:8e276bf812b1 | 1796:2be05515b142 |
|---|---|
| 149 - a7a6f2b5d8a5 | 149 - a7a6f2b5d8a5 |
| 150 | 150 |
| 151 Test obsolete keyword | 151 Test obsolete keyword |
| 152 | 152 |
| 153 $ hg --hidden log -G \ | 153 $ hg --hidden log -G \ |
| 154 > --template '{rev}:{node|short}@{branch}({separate("/", obsolete, phase)}) {desc|firstline}\n' | 154 > --template '{rev}:{node|short}@{branch}({obsolete}/{phase}) {desc|firstline}\n' |
| 155 @ 5:a7a6f2b5d8a5@default(draft) add d | 155 @ 5:a7a6f2b5d8a5@default(/draft) add d |
| 156 | | 156 | |
| 157 | o 4:725c380fe99b@default(draft) add obsol_c' | 157 | o 4:725c380fe99b@default(/draft) add obsol_c' |
| 158 | | | 158 | | |
| 159 x | 3:0d3f46688ccc@default(obsolete/draft) add obsol_c | 159 x | 3:0d3f46688ccc@default(obsolete/draft) add obsol_c |
| 160 |/ | 160 |/ |
| 161 | x 2:4538525df7e2@default(obsolete/draft) add c | 161 | x 2:4538525df7e2@default(obsolete/draft) add c |
| 162 |/ | 162 |/ |
| 163 o 1:7c3bad9141dc@default(draft) add b | 163 o 1:7c3bad9141dc@default(/draft) add b |
| 164 | | 164 | |
| 165 o 0:1f0dee641bb7@default(public) add a | 165 o 0:1f0dee641bb7@default(/public) add a |
| 166 | 166 |
| 167 | 167 |
| 168 Test communication of obsolete relation with a compatible client | 168 Test communication of obsolete relation with a compatible client |
| 169 | 169 |
| 170 $ hg init ../other-new | 170 $ hg init ../other-new |