equal
deleted
inserted
replaced
378 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
378 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
379 |
379 |
380 applied patches after stripping ancestor of queue |
380 applied patches after stripping ancestor of queue |
381 |
381 |
382 $ hg qapplied |
382 $ hg qapplied |
|
383 |
|
384 Verify strip protects against stripping wc parent when there are uncommited mods |
|
385 |
|
386 $ echo b > b |
|
387 $ hg add b |
|
388 $ hg ci -m 'b' |
|
389 $ hg log --graph |
|
390 @ changeset: 1:7519abd79d14 |
|
391 | tag: tip |
|
392 | user: test |
|
393 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
394 | summary: b |
|
395 | |
|
396 o changeset: 0:9ab35a2d17cb |
|
397 user: test |
|
398 date: Thu Jan 01 00:00:00 1970 +0000 |
|
399 summary: a |
|
400 |
|
401 |
|
402 $ echo c > b |
|
403 $ echo c > bar |
|
404 $ hg strip tip |
|
405 abort: local changes found |
|
406 [255] |
|
407 $ hg strip tip --keep |
|
408 saved backup bundle to * (glob) |
|
409 $ hg log --graph |
|
410 @ changeset: 0:9ab35a2d17cb |
|
411 tag: tip |
|
412 user: test |
|
413 date: Thu Jan 01 00:00:00 1970 +0000 |
|
414 summary: a |
|
415 |
|
416 $ hg status |
|
417 M bar |
|
418 ? b |