Mercurial > evolve
comparison tests/test-obsolete.t @ 52:62bdc2567099
Rollback support
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Thu, 08 Sep 2011 17:32:51 +0200 |
| parents | d98e06ab8320 |
| children | d7b11772f0b5 |
comparison
equal
deleted
inserted
replaced
| 51:d98e06ab8320 | 52:62bdc2567099 |
|---|---|
| 201 1 | 201 1 |
| 202 - 7c3bad9141dc | 202 - 7c3bad9141dc |
| 203 0 | 203 0 |
| 204 - 1f0dee641bb7 | 204 - 1f0dee641bb7 |
| 205 | 205 |
| 206 Test rollback support | |
| 207 | |
| 208 $ hg up .^ -q | |
| 209 $ mkcommit "obsol_d''" | |
| 210 created new head | |
| 211 $ hg debugobsolete 8 7 | |
| 212 $ hg -R ../other-new pull . | |
| 213 pulling from . | |
| 214 searching for changes | |
| 215 adding changesets | |
| 216 adding manifests | |
| 217 adding file changes | |
| 218 added 1 changesets with 1 changes to 1 files (+1 heads) | |
| 219 (run 'hg heads .' to see heads, 'hg merge' to merge) | |
| 220 | |
| 221 $ qlog -R ../other-new | |
| 222 8 | |
| 223 - 159dfc9fa5d3 | |
| 224 3 | |
| 225 - 725c380fe99b | |
| 226 2 | |
| 227 - 0d3f46688ccc | |
| 228 1 | |
| 229 - 7c3bad9141dc | |
| 230 0 | |
| 231 - 1f0dee641bb7 | |
| 232 $ hg -R ../other-new rollback | |
| 233 repository tip rolled back to revision 7 (undo pull) | |
| 234 working directory now based on revision -1 | |
| 235 $ qlog -R ../other-new | |
| 236 7 | |
| 237 - 909a0fb57e5d | |
| 238 3 | |
| 239 - 725c380fe99b | |
| 240 2 | |
| 241 - 0d3f46688ccc | |
| 242 1 | |
| 243 - 7c3bad9141dc | |
| 244 0 | |
| 245 - 1f0dee641bb7 | |
| 246 |