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 c4cae234f498…

Parents f4cf3931b26b…

Parents 570730b0de38…

by Adrian Buehlmann

Changes to 7 files · Browse files at c4cae234f498 Showing diff from parent f4cf3931b26b 570730b0de38 Diff from another changeset...

Change 1 of 1 Show Entire File ReleaseProcedure.txt Stacked
 
4
5
6
7
8
9
10
 
4
5
6
 
7
8
9
@@ -4,7 +4,6 @@
 * update ReleaseNotes.txt (major release only)  * set revision number in tortoisehg/hgtk/gdialog.py (major release only)  * set revision number in doc/source/conf.py -* set revision number in win32/shellext/thgversion.h  * tag stable branch of repository, push  * build pdf hgbook, check into thg-winbuild (major release only)  * build release installer
Change 1 of 1 Show Entire File contrib/​wix/​tortoisehg.wxs Stacked
 
14
15
16
17
 
 
 
 
 
 
18
19
20
 
14
15
16
 
17
18
19
20
21
22
23
24
25
@@ -14,7 +14,12 @@
  <?define IsX64 = no ?>   <?endif?>   - <Product Name='TortoiseHg $(var.Version)' Id='*' UpgradeCode='$(var.ProductUpgradeCode)' + <?ifndef ProductId ?> + <?define ProductId=* ?> + <?warning ProductId was not defined. Using $(var.ProductId) ?> + <?endif?> + + <Product Name='TortoiseHg $(var.Version)' Id='$(var.ProductId)' UpgradeCode='$(var.ProductUpgradeCode)'   Language='1033' Codepage='1252' Version='$(var.Version)' Manufacturer='Steve Borho and others.'>     <Package Id='*' Keywords='Installer' Description="Windows shell extension for Mercurial DVCS (version $(var.Version))"
Change 1 of 1 Show Entire File doc/​source/​changelog.txt Stacked
 
372
373
374
375
 
376
377
378
 
372
373
374
 
375
376
377
378
@@ -372,7 +372,7 @@
 Message Parsing  ---------------   -New in TortoiseHg 0.10, the repository browser will detect and underline +New in TortoiseHg 1.0, the repository browser will detect and underline  changeset hashes, HTTP(s) URLs, and bug report identifiers inside  changeset messages. These underlined phrases are clickable links.  
Change 1 of 1 Show Entire File doc/​source/​common.txt Stacked
 
46
47
48
49
 
50
51
52
 
46
47
48
 
49
50
51
52
@@ -46,7 +46,7 @@
    Visual Diff Window   -In TortoiseHg 0.10, the visual (external) diff infrastructure was +In TortoiseHg 1.0, the visual (external) diff infrastructure was  refactored. The new system uses tool descriptions in  :file:`mergetools.ini` to detect most common diff tools on your computer  (including KDiff3, which ships in our installer) and select the best
Change 1 of 1 Show Entire File doc/​source/​faq.txt Stacked
 
102
103
104
105
 
106
107
108
 
102
103
104
 
105
106
107
108
@@ -102,7 +102,7 @@
   *How can I use tool X as my visual diff tool?*   - Since version 0.10, TortoiseHg should autodetect most popular visual + Since version 1.0, TortoiseHg should autodetect most popular visual   diff tools and make them available for selection from the   :guilabel:`Visual Diff Tool` item in the settings tool.  
Change 1 of 1 Show Entire File win32/​shellext/​shellext.rc Stacked
 
2
3
4
5
 
 
 
 
6
7
 
 
 
 
 
 
 
 
 
8
9
10
 
2
3
4
 
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
@@ -2,9 +2,21 @@
 #include "parentid.h"    #ifndef THG_VERSION_FIRST -#include "thgversion.h" +/* dummy version for shellext development */ +#define THG_VERSION_FIRST 0 +#define THG_VERSION_SECOND 0 +#define THG_VERSION_THIRD 55555  #endif   +#ifndef THG_VERSION_SECOND +#define THG_VERSION_SECOND 0 +#endif + +#ifndef THG_VERSION_THIRD +#define THG_VERSION_THIRD 0 +#endif + +  #define TOSTR(x) #x  #define TOSTR2(x) TOSTR(x)  
Change 1 of 1 Show Entire File win32/​shellext/​thgversion.h Stacked
 
1
2
3
 
 
 
 
@@ -1,3 +0,0 @@
-#define THG_VERSION_FIRST 1 -#define THG_VERSION_SECOND 0 -#define THG_VERSION_THIRD 0