# HG changeset patch # User Chris Cannam # Date 1313767843 -3600 # Node ID fb95d70c80d5e740899fd2f01a96498dd57b8d80 # Parent e6141a238811e7c494cc23ff28231bd575a11285 More help diff -r e6141a238811 -r fb95d70c80d5 easyhg.qrc --- a/easyhg.qrc Thu Aug 18 17:13:04 2011 +0100 +++ b/easyhg.qrc Fri Aug 19 16:30:43 2011 +0100 @@ -29,8 +29,14 @@ help/a-04.html help/a-10.html help/a-11.html + help/a-12.html + help/a-20.html + help/a-21.html + help/a-22.html + help/a-23.html help/images/openremote50.png help/images/openfolder50.png + help/images/openlocal50.png easyhg.py easyhg_en.qm diff -r e6141a238811 -r fb95d70c80d5 help/a-11.html --- a/help/a-11.html Thu Aug 18 17:13:04 2011 +0100 +++ b/help/a-11.html Fri Aug 19 16:30:43 2011 +0100 @@ -5,7 +5,8 @@

I have a folder of source code or documents on my computer and I want to use version control to manage it

To start using version control for a project folder, you need to -initialise a repository there.

+initialise a repository there. EasyMercurial does this for you when +you open the folder.

1. Click the Open toolbar button or use File -> Open

@@ -13,12 +14,16 @@

2. Select “File folder” as the thing you want to open

-

3. Browse to your folder

+

3. Browse to your folder

-

4. Click OK*

+

4. Click OK

A new repository will be created, stowed into the working folder you -selected. It will have an empty history, until you add and commit -some files. +selected. At first, it will have an empty history. You can then +start to add and commit changes to your files.

+ +

(You will need to “add” files before you can start to track changes to +them. The default is for all files in the folder to be treated as +“untracked”, i.e. not included in the history.)


Back to Topics

diff -r e6141a238811 -r fb95d70c80d5 help/a-12.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/help/a-12.html Fri Aug 19 16:30:43 2011 +0100 @@ -0,0 +1,19 @@ + +

Back to Topics


+ + +

I have a Mercurial repository on my local computer and I want to use it with EasyMercurial

+ +

Just open it:

+ +

1. Click the Open toolbar button or use File -> Open

+ +

+ +

2. Select “Local repository” as the thing you want to open

+ +

3. Browse to the working folder for your local repository

+ +

4. Click OK

+ +

Back to Topics

diff -r e6141a238811 -r fb95d70c80d5 help/a-20.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/help/a-20.html Fri Aug 19 16:30:43 2011 +0100 @@ -0,0 +1,32 @@ + +

Back to Topics


+ + +

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

+ +

When you add a new file in the working folder, you normally want to +ensure that Mercurial keeps track of changes to that file – and that +the file is included in all copies of the repository. To do this, you +need to tell Mercurial to track the file by adding it to version +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 +there, try clicking the Refresh button.)

+ +

1. Find the file you want to add in the Untracked list and select it

+ +

2. Click Add in the toolbar on the left of the window

+ +

The file will be moved to the “Added” list. This tells Mercurial to +track the file. The next time you commit, the contents of your new +file will be recorded as part of that change set. +

+ +

Of course, you don't always want to track every file in your working +copy. Object files generated by a compiler, output files from tests, +etc should often not be included in version control. You can ensure +that such files don't show up in the Untracked list by right-clicking +on them and choosing “Ignore...".

+ +

Back to Topics

diff -r e6141a238811 -r fb95d70c80d5 help/a-21.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/help/a-21.html Fri Aug 19 16:30:43 2011 +0100 @@ -0,0 +1,24 @@ + +

Back to Topics


+ + +

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

+ +

Click the Commit button in the toolbar on the left to commit all of +the changes you have made to tracked files in your working folder. +That is, all files listed as “Modified”, “Removed”, or “Added” +under “My Work”.

+ +

(If the files you have changed are still listed as “Untracked”, then +you must add them before you can commit. See I've added a new file....

+ +

When you commit your changes, you will be asked for a commit message +which will accompany that change set in the history. Enter something +that will help you remember – and other readers understand – what +you have changed and why.

+ +

If you want to commit only some files, right-click on them in the list +and choose Commit from the context menu. +

+ +

Back to Topics

diff -r e6141a238811 -r fb95d70c80d5 help/a-22.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/help/a-22.html Fri Aug 19 16:30:43 2011 +0100 @@ -0,0 +1,11 @@ + +

Back to Topics


+ + +

I want to rename or remove a file

+ + + + + +

Back to Topics

diff -r e6141a238811 -r fb95d70c80d5 help/a-23.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/help/a-23.html Fri Aug 19 16:30:43 2011 +0100 @@ -0,0 +1,13 @@ + +

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?

+ + + + + + + +

Back to Topics

diff -r e6141a238811 -r fb95d70c80d5 help/generate.sh --- a/help/generate.sh Thu Aug 18 17:13:04 2011 +0100 +++ b/help/generate.sh Fri Aug 19 16:30:43 2011 +0100 @@ -21,6 +21,7 @@ s/^{[\w\s]+}//s; s/^(\s*)([A-Za-z][^\n]*)/$1

$2<\/h2>/s; s/^\s+\*\s+(.*)$/