Mercurial > evolve
comparison tests/test-fold.t @ 2768:85e5a56db776
fold: add support for the -D and -U options
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sun, 23 Jul 2017 07:32:54 +0200 |
| parents | ab80ef8d0cfa |
| children | 766b38594ded |
comparison
equal
deleted
inserted
replaced
| 2767:ab80ef8d0cfa | 2768:85e5a56db776 |
|---|---|
| 198 o 1 - 66f7d451a68b r1 [debugbuilddag] (draft) | 198 o 1 - 66f7d451a68b r1 [debugbuilddag] (draft) |
| 199 | | 199 | |
| 200 o 0 - 1ea73414a91b r0 [debugbuilddag] (public) | 200 o 0 - 1ea73414a91b r0 [debugbuilddag] (public) |
| 201 | 201 |
| 202 | 202 |
| 203 $ hg fold --from 'desc("r4")' -U | |
| 204 2 changesets folded | |
| 205 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 206 $ hg log -G | |
| 207 @ 15 - 91880abed0f2 r4 [test] (draft) | |
| 208 | | |
| 209 | o 12 - b568edbee6e0 r8 [debugbuilddag] (draft) | |
| 210 |/ | |
| 211 o 3 - 2dc09a01254d r3 [debugbuilddag] (draft) | |
| 212 | | |
| 213 o 2 - 01241442b3c2 r2 [debugbuilddag] (draft) | |
| 214 | | |
| 215 o 1 - 66f7d451a68b r1 [debugbuilddag] (draft) | |
| 216 | | |
| 217 o 0 - 1ea73414a91b r0 [debugbuilddag] (public) | |
| 218 | |
| 203 $ cd .. | 219 $ cd .. |
| 204 | 220 |