Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset 299b02ec30ed…

Parents 96721117d24d…

Parents d1a70bc2e679…

by Steve Borho

Changes to 25 files · Browse files at 299b02ec30ed Showing diff from parent 96721117d24d d1a70bc2e679 Diff from another changeset...

doc/​source-ja/​figures/​bundlepreview.png
size changed from 890x410 to 972x407
Removed image
Added image
doc/​source-ja/​figures/​clone.png
size changed from 440x364 to 557x418
Removed image
Added image
doc/​source-ja/​figures/​cmenu-files.png
size changed from 359x365 to 463x275
Removed image
Added image
doc/​source-ja/​figures/​cmenu-global-settings.jpg
Removed image
doc/​source-ja/​figures/​cmenu-global-settings.png
Added image
doc/​source-ja/​figures/​cmenu-nofiles.png
size changed from 538x727 to 565x575
Removed image
Added image
doc/​source-ja/​figures/​import.png
size changed from 484x359 to 580x440
Removed image
Added image
doc/​source-ja/​figures/​init.png
size changed from 396x169 to 433x206
Removed image
Added image
doc/​source-ja/​figures/​log.png
size changed from 753x560 to 972x746
Removed image
Added image
doc/​source-ja/​figures/​newchangeset.png
size changed from 522x78 to 526x147
Removed image
Added image
doc/​source-ja/​figures/​outgoing.png
size changed from 542x177 to 414x137
Removed image
Added image
doc/​source-ja/​figures/​patchqueue.png
size changed from 606x329 to 972x576
mode changed from RGBA to RGB
Removed image
Added image
doc/​source-ja/​figures/​rename.png
size changed from 238x154 to 232x150
Removed image
Added image
doc/​source-ja/​figures/​serve.png
size changed from 602x337 to 516x338
Removed image
Added image
doc/​source-ja/​figures/​settings.png
size changed from 511x695 to 648x538
Removed image
Added image
doc/​source-ja/​figures/​strip.png
size changed from 495x371 to 601x456
mode changed from RGBA to RGB
Removed image
Added image
doc/​source-ja/​figures/​taskbarui.png
size changed from 536x559 to 457x535
Removed image
Added image
doc/​source-ja/​figures/​update.png
size changed from 540x468 to 614x512
Removed image
Added image
doc/​source-ja/​figures/​visual-diff.png
size changed from 415x187 to 631x300
Removed image
Added image
Change 1 of 1 Show Entire File doc/​source/​faq.txt Stacked
 
148
149
150
 
 
 
 
 
 
 
 
151
152
153
 
148
149
150
151
152
153
154
155
156
157
158
159
160
161
@@ -148,6 +148,14 @@
  Note that this will not work for modules distributed as .egg files;   the supplied path must contain the module's .py or .pyc files.   + If you have many extensions and/or hooks that all share the same + Python package, you can create an extension which explicitly + modifies sys.path for all the others. Simply name the extension + such that it is loaded first (alphabetically). Something like:: + + [extensions] + 00setSysPath = C:\path\to\setsyspath.py +  *How do I fix odd characters in dialog?*     Since 0.8, we no longer distribute multiple themes and switched
doc/​source/​figures/​import.png
size changed from 484x359 to 516x426
Removed image
Added image
doc/​source/​figures/​patchqueue.png
size changed from 606x329 to 462x249
mode changed from RGBA to RGB
This image was not loaded automatically because this changeset is very large. Click to load this image...
Change 1 of 2 Show Entire File doc/​source/​intro.txt Stacked
 
38
39
40
41
42
 
 
 
 
43
44
45
 
 
46
47
48
49
50
 
 
 
51
52
53
 
117
118
119
120
121
122
123
124
125
 
 
126
127
128
 
38
39
40
 
 
41
42
43
44
45
 
 
46
47
48
49
50
51
 
52
53
54
55
56
57
 
121
122
123
 
 
 
 
 
 
124
125
126
127
128
@@ -38,16 +38,20 @@
 On Windows  ----------   -TortoiseHg comes with an easy to use MSI installer. Double click on the -installer file and follow the instructions. +TortoiseHg comes with an easy to use MSI installer. You can always find +the most up to date release on our `website +<http://tortoisehg.bitbucket.org/download/windows.html>`_. +Double click on the installer file and follow the instructions.   -After a clean install, a re-login is usually required to start the icon -overlays. +After a first time install, a re-login is usually required to start the +icon overlays.    During upgrades, the installer will ask to close or restart any  applications that have loaded the TortoiseHg shell extension. If you  allow those applications to be closed, the upgrade will not require a -reboot or logout. +reboot or logout. If other users are logged in, or if there are +applications which cannot be shutdown, a reboot will be required to +complete the install.    .. note::   If you have a legacy version of TortoiseHg installed, the 1.0 @@ -117,12 +121,8 @@
 On Linux and Mac  ----------------   -Debian DEB and RPM packages for Fedora are available on the -`download <http://bitbucket.org/tortoisehg/stable/wiki/download/>`_ -page of the wiki. - -Packages for Ubuntu can be found at the TortoiseHg -`PPA <https://launchpad.net/~tortoisehg-ppa>`_ web site. +The most recent Linux packages can be found on our `download +<http://tortoisehg.bitbucket.org/download/linux.html>`_ page.    For Mac OS X, no packages are available but you can run hgtk and all the  dialogs via the source install method. For details, see
Change 1 of 1 Show Entire File doc/​source/​nonhg.txt Stacked
 
150
151
152
153
 
154
155
156
157
158
159
 
160
161
162
 
150
151
152
 
153
154
155
156
157
158
 
159
160
161
162
@@ -150,13 +150,13 @@
 dulwich) that hg-git requires, so one only needs to clone the  hg-git repository to your local computer::   - hg clone http://bitbucket.org/durin42/hg-git/ C:\hggit + hg clone http://bitbucket.org/durin42/hg-git/ C:\hg-git    Then enable hggit and bookmarks in your Mercurial.ini file::     [extensions]   bookmarks = - hggit = C:\hggit + hggit = C:\hg-git\hggit    You can verify that worked by typing :command:`hg help hggit`  
Change 1 of 1 Show Entire File doc/​source/​patches.txt Stacked
 
159
160
161
162
163
 
 
164
165
 
159
160
161
 
 
162
163
164
165
@@ -159,7 +159,7 @@
 Both the Repository Explorer and Commit Tool have optional Patch Queue  panels that are available when the user has enabled the MQ extension.  It allows the user to perform most patch operations including push, pop, -rename, and finish. It's recommended that to learn the MQ extension -before using the Patch Queue panel. +rename, and finish. It's recommended to learn the MQ extension before +using the Patch Queue panel.    .. vim: noet ts=4