Mercurial > hg
comparison tests/test-mq.out @ 6472:8c4cd80afd3e
mq: add --force option to strip
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Fri, 04 Apr 2008 17:44:31 +0200 |
parents | 949e607ac544 |
children | 550c53d66949 |
comparison
equal
deleted
inserted
replaced
6471:0c1ec0cd7c6a | 6472:8c4cd80afd3e |
---|---|
248 adding changesets | 248 adding changesets |
249 adding manifests | 249 adding manifests |
250 adding file changes | 250 adding file changes |
251 added 1 changesets with 1 changes to 1 files | 251 added 1 changesets with 1 changes to 1 files |
252 (run 'hg update' to get a working copy) | 252 (run 'hg update' to get a working copy) |
253 % strip with local changes, should complain | |
254 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
255 abort: local changes found | |
256 % --force strip with local changes | |
257 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
258 saving bundle to | |
253 % cd b; hg qrefresh | 259 % cd b; hg qrefresh |
254 adding a | 260 adding a |
255 foo | 261 foo |
256 | 262 |
257 diff -r cb9a9f314b8b a | 263 diff -r cb9a9f314b8b a |