Mercurial > hg
diff tests/test-shelve.t @ 52098:b5efb7a7d2a5 stable
docstring: backed out changeset 51057ab0dffa
In retrospect this is too much of a behavior change for stable. So I grafted the
same change as 31076a2301f1 on default, and I am backing out its version on
stable.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 25 Oct 2024 23:54:24 +0200 |
parents | 51057ab0dffa |
children | 19ae7730636a |
line wrap: on
line diff
--- a/tests/test-shelve.t Thu Oct 24 18:58:58 2024 +0200 +++ b/tests/test-shelve.t Fri Oct 25 23:54:24 2024 +0200 @@ -45,34 +45,34 @@ save and set aside changes from the working directory - Shelving takes files that "hg status" reports as not clean, saves the - modifications to a bundle (a shelved change), and reverts the files so that - their state in the working directory becomes clean. + Shelving takes files that "hg status" reports as not clean, saves the + modifications to a bundle (a shelved change), and reverts the files so + that their state in the working directory becomes clean. - To restore these changes to the working directory, using "hg unshelve"; this - will work even if you switch to a different commit. + To restore these changes to the working directory, using "hg unshelve"; + this will work even if you switch to a different commit. - When no files are specified, "hg shelve" saves all not-clean files. If - specific files or directories are named, only changes to those files are - shelved. + When no files are specified, "hg shelve" saves all not-clean files. If + specific files or directories are named, only changes to those files are + shelved. - In bare shelve (when no files are specified, without interactive, include and - exclude option), shelving remembers information if the working directory was - on newly created branch, in other words working directory was on different - branch than its first parent. In this situation unshelving restores branch - information to the working directory. + In bare shelve (when no files are specified, without interactive, include + and exclude option), shelving remembers information if the working + directory was on newly created branch, in other words working directory + was on different branch than its first parent. In this situation + unshelving restores branch information to the working directory. - Each shelved change has a name that makes it easier to find later. The name of - a shelved change defaults to being based on the active bookmark, or if there - is no active bookmark, the current named branch. To specify a different name, - use "--name". + Each shelved change has a name that makes it easier to find later. The + name of a shelved change defaults to being based on the active bookmark, + or if there is no active bookmark, the current named branch. To specify a + different name, use "--name". - To see a list of existing shelved changes, use the "--list" option. For each - shelved change, this will print its name, age, and description; use "--patch" - or "--stat" for more details. + To see a list of existing shelved changes, use the "--list" option. For + each shelved change, this will print its name, age, and description; use " + --patch" or "--stat" for more details. - To delete specific shelved changes, use "--delete". To delete all shelved - changes, use "--cleanup". + To delete specific shelved changes, use "--delete". To delete all shelved + changes, use "--cleanup". options ([+] can be repeated):