# HG changeset patch # User Jason R. Coombs # Date 1660745835 14400 # Node ID 34dddc5d2e2ffd13fc78c71c079e9161e440ccce # Parent ffb130cd3f2769477c92a4141ae7ab26ecb1698e shelve: in test for trailing whitespace, strip commit (issue6735) diff -r ffb130cd3f27 -r 34dddc5d2e2f tests/test-shelve.t --- a/tests/test-shelve.t Mon Aug 15 10:26:01 2022 -0400 +++ b/tests/test-shelve.t Wed Aug 17 10:17:15 2022 -0400 @@ -1534,20 +1534,14 @@ $ hg update -q --clean . $ hg patch -p1 test_patch.patch applying test_patch.patch + + $ hg strip -q -r . #endif - Check the comment of the last commit for consistency -#if no-windows - $ hg log -r . --template '{desc}\n' - changes to: add C to bars -#endif - -#if windows $ hg log -r . --template '{desc}\n' add C to bars -#endif -- if phasebased, shelve works without patch and bundle