Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

merge with stable

Changeset 77420c798b6a…

Parents c289629060a1…

Parents 56b110c292e9…

by Steve Borho

Changes to 10 files · Browse files at 77420c798b6a Showing diff from parent c289629060a1 56b110c292e9 Diff from another changeset...

Change 1 of 1 Show Entire File doc/​source/​changelog.txt Stacked
 
128
129
130
 
 
131
132
133
 
128
129
130
131
132
133
134
135
@@ -128,6 +128,8 @@
 .. figure:: figures/logfilter.jpg   :alt: Revision filter dialog   + Log Filtering Dialog +  File Context Menus  ------------------  
Change 1 of 2 Show Entire File doc/​source/​clone.txt Stacked
 
10
11
12
 
 
13
14
15
 
49
50
51
52
 
 
 
10
11
12
13
14
15
16
17
 
51
52
53
 
 
54
@@ -10,6 +10,8 @@
   .. figure:: figures/clone.png   :alt: Clone dialog + + Clone Dialog    :guilabel:`Source Path`   It is the path (or URL) of the repository that will be cloned. Use the :guilabel:`Browse...` to @@ -49,4 +51,4 @@
   where [SOURCE] and [DEST] are, the paths of source repository and destination folder.   -.. vim: noet ts=4 \ No newline at end of file
+.. vim: noet ts=4
Change 1 of 1 Show Entire File doc/​source/​datamine.txt Stacked
 
15
16
17
18
 
19
20
21
 
15
16
17
 
18
19
20
21
@@ -15,7 +15,7 @@
 .. figure:: figures/search.png   :alt: Search dialog   - Search dialog + Search tabs    The search tab is used to search (*grep*) through your entire revision  history for keywords, variable names, functions, etc...
Change 1 of 1 Show Entire File doc/​source/​explorer.txt Stacked
 
39
40
41
42
 
43
44
45
 
39
40
41
 
42
43
44
45
@@ -39,7 +39,7 @@
  Taskbar Options Dialog    Release 0.8.1 introduced the ability to selectively disable overlay -icons in specific repositories. This can be done be editing the +icons in specific repositories. This can be done by editing the  :file:`.hg\\thgstatus` file inside the repository and replacing it's  contents with a single line containing::  
Change 1 of 1 Show Entire File doc/​source/​guess.txt Stacked
 
7
8
9
 
 
10
11
12
 
7
8
9
10
11
12
13
14
@@ -7,6 +7,8 @@
 .. figure:: figures/guess.jpg   :alt: Rename guessing dialog   + Rename Guessing Dialog +  This dialog is used to find renames, moves, and/or copies that were done  without Mercurial's knowledge. The dialog can be launched from the  shell context menu, or from the status or commit tools via the context
Change 1 of 1 Show Entire File doc/​source/​ignore.txt Stacked
 
13
14
15
 
 
16
17
18
 
13
14
15
16
17
18
19
20
@@ -13,6 +13,8 @@
 .. figure:: figures/ignore.jpg   :alt: Ignore filter dialog   + Ignore Filter Dialog +  From command line  -----------------  
Change 1 of 2 Show Entire File doc/​source/​init.txt Stacked
 
12
13
14
 
 
15
16
17
 
26
27
28
29
 
30
31
32
33
 
34
35
36
 
12
13
14
15
16
17
18
19
 
28
29
30
 
31
32
33
34
 
35
36
37
38
@@ -12,6 +12,8 @@
 .. figure:: figures/init.png   :alt: Init dialog   + Repository Init Dialog +  :guilabel:`Destination`   Is the directory where the repository will be created. It is   always filled with the current directory, so if you launch the @@ -26,11 +28,11 @@
   Creating a new repository means create a subdirectory called :file:`.hg`.  In this subdirectory Mercurial keeps all versioning information. - +  .. warning::   Never touch the files in :file:`.hg` directory, otherwise a repository   corruption can happen. - +  From command line  -----------------  
Change 1 of 1 Show Entire File doc/​source/​preface.txt Stacked
 
29
30
31
 
 
 
 
 
 
 
 
32
33
34
35
36
37
38
39
40
 
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
 
 
44
45
46
@@ -29,12 +29,18 @@
   :doc:`quick` is a quick tutorial on how to start with TortoiseHg.   +:doc:`daily` is the main chapter, it describes the frequently used +components of TortoiseHg. + +:doc:`settings` describes how to configure TortoiseHg. + +:doc:`recovery` describes the the recovery operations to do on +a project. +  :doc:`faq` has a list of common questions and their answers.    :doc:`debugging` describes how to debug any problems that you find.   -The remaining chapters describe the components that make up TortoiseHg. -  TortoiseHg is free!  ===================  
Change 1 of 6 Show Entire File doc/​source/​quick.txt Stacked
 
32
33
34
 
 
35
36
37
 
66
67
68
 
 
69
70
71
 
146
147
148
 
149
150
151
 
161
162
163
 
 
164
165
166
 
186
187
188
 
 
189
190
191
 
237
238
239
 
 
240
241
242
 
32
33
34
35
36
37
38
39
 
68
69
70
71
72
73
74
75
 
150
151
152
153
154
155
156
 
166
167
168
169
170
171
172
173
 
193
194
195
196
197
198
199
200
 
246
247
248
249
250
251
252
253
@@ -32,6 +32,8 @@
 .. figure:: figures/cmenu-nofiles.jpg   :alt: Context Menu   + Context menu with no files selected +  You must then select the :guilabel:`Commit` tab and enter a name in the  :guilabel:`Username` field.   @@ -66,6 +68,8 @@
 .. figure:: figures/init.png   :alt: Init dialog   + Repository Init Dialog +  We suggest you keep :guilabel:`Add special files (.hgignore, ...)`  checked, and do not check  :guilabel:`Make repo compatible with Mercurial 1.0` @@ -146,6 +150,7 @@
 .. figure:: figures/commit.png   :alt: Commit dialog   + Commit Tool    Share the repository  ==================== @@ -161,6 +166,8 @@
 .. figure:: figures/share.png   :alt: Clone dialog   + Clone Dialog +  When you create a clone for the purposes of generating a *central  repository* there is no reason for that clone to have a working  directory. Checking @@ -186,6 +193,8 @@
 .. figure:: figures/clone.png   :alt: Clone dialog   + Clone Dialog +  This time you do want to update the working directory because you want  to work on the project, uncheck  :guilabel:`do not update the new working directory` so Mercurial updates @@ -237,6 +246,8 @@
 .. figure:: figures/synchronize.png   :alt: Synchronize dialog   + Synchronize Dialog +  Mercurial makes collaboration easy, fast, and productive.  Learn more at Mercurial's `wiki <http://mercurial.selenic.com/wiki/>`_.  
Change 1 of 1 Show Entire File doc/​source/​recovery.txt Stacked
 
8
9
10
 
 
11
12
13
 
8
9
10
11
12
13
14
15
@@ -8,6 +8,8 @@
 .. figure:: figures/recover.png   :alt: Recovery dialog   + Recovery Dialog +  The toolbar buttons equate to a Mercurial command    :guilabel:`clean`