Mercurial > hg > easyhg
changeset 497:a9032181c37d
More help
| author | Chris Cannam |
|---|---|
| date | Mon, 22 Aug 2011 15:19:00 +0100 |
| parents | fb95d70c80d5 |
| children | 21aa41b62c3a |
| files | easyhg.qrc help/a-20.html help/a-22.html help/a-23.html help/topics.html help/topics/20.txt help/topics/22.txt help/topics/23.txt help/topics/30.txt |
| diffstat | 9 files changed, 86 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/easyhg.qrc Fri Aug 19 16:30:43 2011 +0100 +++ b/easyhg.qrc Mon Aug 22 15:19:00 2011 +0100 @@ -34,6 +34,7 @@ <file>help/a-21.html</file> <file>help/a-22.html</file> <file>help/a-23.html</file> + <file>help/a-30.html</file> <file>help/images/openremote50.png</file> <file>help/images/openfolder50.png</file> <file>help/images/openlocal50.png</file>
--- a/help/a-20.html Fri Aug 19 16:30:43 2011 +0100 +++ b/help/a-20.html Mon Aug 22 15:19:00 2011 +0100 @@ -11,7 +11,7 @@ control.</p> <p>EasyMercurial shows files that have been created but not added in the -<b>“Untracked”</b> file list under “My Work”. (If your file is not listed +<b>“Untracked”</b> file list under “My work”. (If your file is not listed there, try clicking the Refresh button.)</p> <p><b>1. Find the file you want to add in the Untracked list and select it</b></p>
--- a/help/a-22.html Fri Aug 19 16:30:43 2011 +0100 +++ b/help/a-22.html Mon Aug 22 15:19:00 2011 +0100 @@ -2,9 +2,33 @@ <p><a href="topics.html">Back to Topics</a></p><hr> -<h2>I want to rename or remove a file</h2> +<h2>I want to remove, rename, or copy a file</h2> +<p>To remove or rename a file, you first need to find it in the list of +files under “My work”. This area normally shows only those files that +you have changed since your last commit: if it isn't one of those, +toggle the “Show all files” option at the bottom of the window.</p> +<p>To <b>remove</b> a file from version control so that changes to it are no longer tracked:</p> + +<p><b>1. Select the file you want to remove in the list of files under “My work”.</b></p> + +<p><b>2. Click Remove in the toolbar on the left of the window</b></p> + +<p>The file will be moved to the <b>“Removed”</b> list. This tells Mercurial +to stop tracking the file the next time you commit. The file itself +is not removed from the disc: you will need to do that using your +system file manager afterwards. +<ul><li>Note: the equivalent Mercurial command for this is <b>hg remove -Af</b></li></ul></p> + +<p>To <b>rename</b> or <b>copy</b> a file:</p> + +<p><b>1. Select the file you want to remove in the list of files under “My work”.</b></p> + +<p><b>2. Right-click and select “Rename..." or “Copy..." on the context menu</b></p> + +<p><b>3. Enter a new name for the file.</b> +<ul><li>Note: the equivalent Mercurial commands are <b>hg rename</b> and <b>hg copy</b></li></ul></p>
--- a/help/a-23.html Fri Aug 19 16:30:43 2011 +0100 +++ b/help/a-23.html Mon Aug 22 15:19:00 2011 +0100 @@ -2,7 +2,22 @@ <p><a href="topics.html">Back to Topics</a></p><hr> -<h2>I just renamed or removed a file using the system file manager – then I remembered I was supposed to do it using the version control tool – what now?</h2> +<h2>I just deleted a file using the system file manager – then remembered I hadn't told the version control tool about it – what now?</h2> + +<p>No problem.</p> + +<p>Any files that the version control system knows about but that can't +be found in your working copy are shown as <b>“Missing”</b> under “My +work”. All you need to do is:</p> + +<p><b>1. Find your file in the “Missing” list and select it</b></p> + +<p><b>2. Click Remove in the toolbar on the left of the window</b></p> + +<p>This tells Mercurial that you haven't merely lost the file, but that +you intended to remove it. The next time you commit, it will be +removed from tracking in version control.</p> +
--- a/help/topics.html Fri Aug 19 16:30:43 2011 +0100 +++ b/help/topics.html Mon Aug 22 15:19:00 2011 +0100 @@ -12,5 +12,5 @@ <h3>Making changes</h3> <p><a href="a-20.html">I've added a new file: what do I do with it?</a></p> <p><a href="a-21.html">I have changed some files and I want to record the changes</a></p> -<p><a href="a-22.html">I want to rename or remove a file</a></p> -<p><a href="a-23.html">I just renamed or removed a file using the system file manager – then I remembered I was supposed to do it using the version control tool – what now?</a></p> +<p><a href="a-22.html">I want to remove, rename, or copy a file</a></p> +<p><a href="a-23.html">I just deleted a file using the system file manager – then remembered I hadn't told the version control tool about it – what now?</a></p>
--- a/help/topics/20.txt Fri Aug 19 16:30:43 2011 +0100 +++ b/help/topics/20.txt Mon Aug 22 15:19:00 2011 +0100 @@ -9,7 +9,7 @@ control. EasyMercurial shows files that have been created but not added in the -*"Untracked"* file list under "My Work". (If your file is not listed +*"Untracked"* file list under "My work". (If your file is not listed there, try clicking the Refresh button.) *1. Find the file you want to add in the Untracked list and select it*
--- a/help/topics/22.txt Fri Aug 19 16:30:43 2011 +0100 +++ b/help/topics/22.txt Mon Aug 22 15:19:00 2011 +0100 @@ -1,8 +1,34 @@ {Making changes} -I want to rename or remove a file +I want to remove, rename, or copy a file +To remove or rename a file, you first need to find it in the list of +files under "My work". This area normally shows only those files that +you have changed since your last commit: if it isn't one of those, +toggle the "Show all files" option at the bottom of the window. +To *remove* a file from version control so that changes to it are no longer tracked: +*1. Select the file you want to remove in the list of files under "My work".* +*2. Click Remove in the toolbar on the left of the window* +The file will be moved to the *"Removed"* list. This tells Mercurial +to stop tracking the file the next time you commit. The file itself +is not removed from the disc: you will need to do that using your +system file manager afterwards. + + * Note: the equivalent Mercurial command for this is *hg remove -Af* + +To *rename* or *copy* a file: + +*1. Select the file you want to remove in the list of files under "My work".* + +*2. Right-click and select "Rename..." or "Copy..." on the context menu* + +*3. Enter a new name for the file.* + + * Note: the equivalent Mercurial commands are *hg rename* and *hg copy* + + +
--- a/help/topics/23.txt Fri Aug 19 16:30:43 2011 +0100 +++ b/help/topics/23.txt Mon Aug 22 15:19:00 2011 +0100 @@ -1,10 +1,18 @@ {Making changes} -I just renamed or removed a file using the system file manager -- then I remembered I was supposed to do it using the version control tool -- what now? +I just deleted a file using the system file manager -- then remembered I hadn't told the version control tool about it -- what now? +Any files that the version control system thinks should be there, but +that can't be found in your working copy are shown as *"Missing"* +under "My work". All you need to do is: +*1. Find your file in the "Missing" list and select it* +*2. Click Remove in the toolbar on the left of the window* +This tells Mercurial that you haven't merely lost the file, but that +you intended to remove it. The next time you commit, it will be +removed from tracking in version control.