Mercurial > evolve
comparison tests/test-obsolete.t @ 1751:bc590681de77 mercurial-3.4
merge with future 5.5
All was fine for 3.4.
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Fri, 28 Oct 2016 17:02:56 +0200 |
parents | 05d7df73a56b 83cf722eafc3 |
children | 6d54fd20bb81 |
comparison
equal
deleted
inserted
replaced
1708:be726abb5f91 | 1751:bc590681de77 |
---|---|
148 5 | 148 5 |
149 - a7a6f2b5d8a5 | 149 - a7a6f2b5d8a5 |
150 | 150 |
151 Test obsolete keyword | 151 Test obsolete keyword |
152 | 152 |
153 $ hg log -G --template '{rev}:{node|short}@{branch}({obsolete}/{phase}) {desc|firstline}\n' \ | 153 $ hg --hidden log -G \ |
154 > --hidden | 154 > --template '{rev}:{node|short}@{branch}({obsolete}/{phase}) {desc|firstline}\n' |
155 @ 5:a7a6f2b5d8a5@default(unstable/draft) add d | 155 @ 5:a7a6f2b5d8a5@default(/draft) add d |
156 | | 156 | |
157 | o 4:725c380fe99b@default(stable/draft) add obsol_c' | 157 | o 4:725c380fe99b@default(/draft) add obsol_c' |
158 | | | 158 | | |
159 x | 3:0d3f46688ccc@default(suspended/draft) add obsol_c | 159 x | 3:0d3f46688ccc@default(obsolete/draft) add obsol_c |
160 |/ | 160 |/ |
161 | x 2:4538525df7e2@default(extinct/draft) add c | 161 | x 2:4538525df7e2@default(obsolete/draft) add c |
162 |/ | 162 |/ |
163 o 1:7c3bad9141dc@default(stable/draft) add b | 163 o 1:7c3bad9141dc@default(/draft) add b |
164 | | 164 | |
165 o 0:1f0dee641bb7@default(stable/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 |