# HG changeset patch # User Chris Cannam # Date 1314022740 -3600 # Node ID a9032181c37d1ef27e332687d724ba36ccb78cbe # Parent fb95d70c80d5e740899fd2f01a96498dd57b8d80 More help diff -r fb95d70c80d5 -r a9032181c37d easyhg.qrc --- 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 @@ help/a-21.html help/a-22.html help/a-23.html + help/a-30.html help/images/openremote50.png help/images/openfolder50.png help/images/openlocal50.png diff -r fb95d70c80d5 -r a9032181c37d help/a-20.html --- 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.

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

diff -r fb95d70c80d5 -r a9032181c37d help/a-22.html --- 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 @@

Back to Topics


-

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. +

+ +

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. +

diff -r fb95d70c80d5 -r a9032181c37d help/a-23.html --- 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 @@

Back to Topics


-

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?

+ +

No problem.

+ +

Any files that the version control system knows about 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.

+ diff -r fb95d70c80d5 -r a9032181c37d help/topics.html --- 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 @@

Making changes

I've added a new file: what do I do with it?

I have changed some files and I want to record the changes

-

I want to rename or remove a file

-

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 want to remove, rename, or copy a file

+

I just deleted a file using the system file manager – then remembered I hadn't told the version control tool about it – what now?

diff -r fb95d70c80d5 -r a9032181c37d help/topics/20.txt --- 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* diff -r fb95d70c80d5 -r a9032181c37d help/topics/22.txt --- 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* + + + diff -r fb95d70c80d5 -r a9032181c37d help/topics/23.txt --- 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. diff -r fb95d70c80d5 -r a9032181c37d help/topics/30.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/help/topics/30.txt Mon Aug 22 15:19:00 2011 +0100 @@ -0,0 +1,4 @@ +{Sharing changes} + +I have committed a few changes -- how do I share them with my colleagues? +