Mercurial > hg
comparison tests/test-shelve.t @ 49454:34dddc5d2e2f
shelve: in test for trailing whitespace, strip commit (issue6735)
| author | Jason R. Coombs <jaraco@jaraco.com> |
|---|---|
| date | Wed, 17 Aug 2022 10:17:15 -0400 |
| parents | ffb130cd3f27 |
| children | 744b341782f4 |
comparison
equal
deleted
inserted
replaced
| 49453:ffb130cd3f27 | 49454:34dddc5d2e2f |
|---|---|
| 1532 $ cat 'my filename ' | 1532 $ cat 'my filename ' |
| 1533 hi | 1533 hi |
| 1534 $ hg update -q --clean . | 1534 $ hg update -q --clean . |
| 1535 $ hg patch -p1 test_patch.patch | 1535 $ hg patch -p1 test_patch.patch |
| 1536 applying test_patch.patch | 1536 applying test_patch.patch |
| 1537 | |
| 1538 $ hg strip -q -r . | |
| 1537 #endif | 1539 #endif |
| 1538 | 1540 |
| 1539 | |
| 1540 Check the comment of the last commit for consistency | 1541 Check the comment of the last commit for consistency |
| 1541 | 1542 |
| 1542 #if no-windows | |
| 1543 $ hg log -r . --template '{desc}\n' | |
| 1544 changes to: add C to bars | |
| 1545 #endif | |
| 1546 | |
| 1547 #if windows | |
| 1548 $ hg log -r . --template '{desc}\n' | 1543 $ hg log -r . --template '{desc}\n' |
| 1549 add C to bars | 1544 add C to bars |
| 1550 #endif | |
| 1551 | 1545 |
| 1552 -- if phasebased, shelve works without patch and bundle | 1546 -- if phasebased, shelve works without patch and bundle |
| 1553 | 1547 |
| 1554 $ hg update -q --clean . | 1548 $ hg update -q --clean . |
| 1555 $ hg strip -q -r 0 | 1549 $ hg strip -q -r 0 |