We are currently indexing your data, so search results may be incomplete until we finish.
Merge with stable
by
Changes to 5 files · Browse files at bee1c3a2ce67 Showing diff from parent f0abb760ff7f e71e57656cb7 Diff from another changeset...
-
MANIFEST.in
-
ReleaseProcedure.txt
-
doc/source/changelog.txt
-
doc/source/faq.txt
-
doc/source/figures/visual-diff.jpg
size changed from 416x231 to 416x286
|
@@ -1,6 +1,7 @@ recursive-include icons *.png *.ico *.svg *.txt
include contrib/_hgtk
include contrib/nautilus-thg.py
+include contrib/mergetools.rc
include COPYING.txt ReleaseNotes.txt
recursive-include i18n *.po
recursive-include doc *
|
||
|
@@ -7,19 +7,15 @@ * tag stable branch of repository, push
* build pdf hgbook, check into thg-winbuild (major release only)
* build release installer
-* commit and tag thg-winbuild
+* commit, tag, push thg-winbuild
* create and upload a tarball (python setup.py sdist)
* upload installer to bitbucket, sourceforge, codeplex
* update URLs and front page of thg-web
-* update thg-web curversion.txt, commit, push
-* update download wiki page
+* update thg-html curversion.txt, regen thg-web, commit, push
* update NEWS on wiki front page
-* build html hgbook, check into thg-web (major release only)
-* upload hgbook pdf to bitbucket (major release only)
-* upload PDF and CHM, update wiki links (major release only)
+* build html,pdf hgbook, check into thg-web (major release only)
* wiki: Move ReleaseNotes to old-release-notes (major release only)
* wiki: Move FixedBugs or upcoming-release-notes to ReleaseNotes, empty FixedBugs
-* update FAQ entries
* [ANN] email to tortoisehg-discuss and mercurial@selenic.com
* Update Mercurial wiki NEWS and Downloads and TortoiseHg pages
* Add the new version number and new features to the issue tracker
|
||
|
@@ -429,18 +429,18 @@ TortoiseHg 1.0 introduced support for bisect bug searching to help find
changesets which introduce problems. To use, mark the earliest changeset
you know exhibits the problem as bad, then mark the latest changeset
-which is free from the problem as good. Once you have performed tests,
-mark the working directory parent as good or bad, and bisect will either
-update to another candidate changeset or announce that it has found the
-bad revision.
+which is free from the problem as good. The changelog tool will select
+a changeset for you to test. Once you have performed tests, mark the
+changeset as good or bad, and bisect will either update to another
+candidate changeset or announce that it has found the bad revision.
As a shortcut, you can also mark a revision as good or bad without
checking it out first.
For more automated bisecting, you must use the Mercurial command line
and provide an automated test that can build and run a changeset and
-return 0-good, 125-skip, or 127-abort, or anythin else to mean bad. See
-the :command:`hg bisect` command help for more information.
+return 0-good, 125-skip, or 127-abort, or anything else to mean bad.
+See the :command:`hg bisect` command help for more information.
Keyboard navigation
|
||
|
@@ -57,8 +57,8 @@
*How do I do merges and arbitrary version checkouts?*
- Merges and updates are intended to be done from within the Changelog
- tool (:guilabel:`Repository Explorer` menu option)
+ Merges and updates are intended to be done within the
+ :guilabel:`Repository Explorer`, using changeset context menus
*How do I use TortoiseHg's shelve extension from the hg command line?*
@@ -131,9 +131,9 @@
*How do I switch GTK themes?*
- You also should be able to download new themes and copy them into
- the :file:`gtk\\share\\themes` directory and then enable them in
- :file:`gtk\\etc\\gtk-2.0\\gtkrc`.
+ You can download new themes and copy them into the
+ :file:`gtk\\share\\themes` directory of your install and then enable
+ them in :file:`gtk\\etc\\gtk-2.0\\gtkrc`.
*Where do TortoiseHg extensions look for external Python modules on Windows?*
@@ -165,13 +165,11 @@ [extensions]
00setSysPath = C:\path\to\setsyspath.py
-*How do I fix odd characters in dialog?*
+*How do I fix odd characters in dialogs?*
- Since 0.8, we no longer distribute multiple themes and switched
- default theme to MS-Windows. As a result, it might causes an issue
- related default font of MS-Windows theme in some environments. In
- order to fix this issue, add following setting to TortoiseHg's
- :file:`gtkrc` file::
+ The default font of the MS-Windows theme may cause problems in some
+ environments. In order to fix this issue, add following setting to
+ TortoiseHg's :file:`gtkrc` file::
style "msw-default"
{
@@ -181,4 +179,6 @@ You can find :file:`gtkrc` file in your TortoiseHg install directory:
i.e. :file:`C:\\Program Files\\TortoiseHg\\gtk\\etc\\gtk-2.0\\gtkrc`
+ Also see the :guilabel:`Fonts` page of the settings tool
+
.. vim: noet ts=4
|
||
|
doc/source/figures/visual-diff.jpg
size changed from 416x231 to 416x286
|
||
|---|---|---|
|
Add a tag
Loading...