Mercurial > evolve
comparison tests/test-prune.t @ 929:306f67906a6c stable
merge with all other change to 3.3
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Sun, 11 May 2014 01:17:02 -0700 |
| parents | 69872cef6053 |
| children | c17ab719da56 32915143d448 |
comparison
equal
deleted
inserted
replaced
| 928:be39695cbfda | 929:306f67906a6c |
|---|---|
| 234 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 234 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 235 $ hg prune -B nostrip | 235 $ hg prune -B nostrip |
| 236 bookmark 'nostrip' deleted | 236 bookmark 'nostrip' deleted |
| 237 abort: nothing to prune | 237 abort: nothing to prune |
| 238 [255] | 238 [255] |
| 239 $ hg tag --remove --local a | |
| 239 $ hg prune -B todelete | 240 $ hg prune -B todelete |
| 240 1 changesets pruned | 241 1 changesets pruned |
| 241 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 242 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 242 working directory now at d62d843c9a01 | 243 working directory now at d62d843c9a01 |
| 243 bookmark 'todelete' deleted | 244 bookmark 'todelete' deleted |
| 250 B 10:ff43616e5d0f | 251 B 10:ff43616e5d0f |
| 251 delete 6:2702dd0c91e7 | 252 delete 6:2702dd0c91e7 |
| 252 $ hg prune -B delete | 253 $ hg prune -B delete |
| 253 3 changesets pruned | 254 3 changesets pruned |
| 254 bookmark 'delete' deleted | 255 bookmark 'delete' deleted |
| 256 $ hg tag --remove --local c | |
| 255 $ hg id -ir 6:2702dd0c91e7 | 257 $ hg id -ir 6:2702dd0c91e7 |
| 256 abort: unknown revision '2702dd0c91e7'! | 258 abort: unknown revision '2702dd0c91e7'! |
| 257 [255] | 259 [255] |
| 258 | 260 |