Mercurial > hg
comparison tests/test-mq @ 6472:8c4cd80afd3e
mq: add --force option to strip
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Fri, 04 Apr 2008 17:44:31 +0200 |
parents | 9db24a36d182 |
children | 550c53d66949 |
comparison
equal
deleted
inserted
replaced
6471:0c1ec0cd7c6a | 6472:8c4cd80afd3e |
---|---|
264 echo x>x | 264 echo x>x |
265 hg ci -Ama | 265 hg ci -Ama |
266 hg strip tip 2>&1 | sed 's/\(saving bundle to \).*/\1/' | 266 hg strip tip 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
267 hg unbundle .hg/strip-backup/* | 267 hg unbundle .hg/strip-backup/* |
268 | 268 |
269 echo % strip with local changes, should complain | |
270 hg up | |
271 echo y>y | |
272 hg add y | |
273 hg strip tip | sed 's/\(saving bundle to \).*/\1/' | |
274 echo % --force strip with local changes | |
275 hg strip -f tip 2>&1 | sed 's/\(saving bundle to \).*/\1/' | |
276 | |
269 echo '% cd b; hg qrefresh' | 277 echo '% cd b; hg qrefresh' |
270 hg init refresh | 278 hg init refresh |
271 cd refresh | 279 cd refresh |
272 echo a > a | 280 echo a > a |
273 hg ci -Ama -d'0 0' | 281 hg ci -Ama -d'0 0' |