Mercurial > evolve
comparison tests/test-fold.t @ 4360:522abf1d70b7 mercurial-4.6
test-compat: merge mercurial-4.7 into mercurial-4.6
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 22 Jan 2019 12:54:44 -0500 |
parents | 5300be965515 |
children | 8bd60e09dfb4 41885988921e |
comparison
equal
deleted
inserted
replaced
4313:4a740f9eee49 | 4360:522abf1d70b7 |
---|---|
242 | | 242 | |
243 o 1 - 66f7d451a68b r1 [debugbuilddag] (draft) | 243 o 1 - 66f7d451a68b r1 [debugbuilddag] (draft) |
244 | | 244 | |
245 o 0 - 1ea73414a91b r0 [debugbuilddag] (public) | 245 o 0 - 1ea73414a91b r0 [debugbuilddag] (public) |
246 | 246 |
247 Test order of proposed commit message | |
248 | |
249 $ hg fold --exact --hidden -r 4 -r 5 -r 6 | |
250 2 new content-divergent changesets | |
251 3 changesets folded | |
252 $ hg log -r tip -T '{desc}' | |
253 r4 | |
254 | |
255 | |
256 r5 | |
257 | |
258 | |
259 r6 (no-eol) | |
260 $ hg fold --exact --hidden -r 6 -r 4 -r 5 | |
261 3 changesets folded | |
262 $ hg log -r tip -T '{desc}' | |
263 r4 | |
264 | |
265 | |
266 r5 | |
267 | |
268 | |
269 r6 (no-eol) | |
270 | |
247 $ cd .. | 271 $ cd .. |
248 | 272 |