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

Parents a82bace8c524…

Parents 6a14048e4920…

by Steve Borho

Changes to 2 files · Browse files at b74c6392c828 Showing diff from parent a82bace8c524 6a14048e4920 Diff from another changeset...

Change 1 of 1 Show Entire File doc/​source/​commit.txt Stacked
 
352
353
354
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
355
356
357
 
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
@@ -352,6 +352,27 @@
  can be used to format the message and a warning will be issued   if any lines are too long at commit. Default: 0 (unenforced)   + +Subrepositories +--------------- + +A `subrepository <http://mercurial.selenic.com/wiki/subrepos>`_ +is a feature introduced in Mercurial 1.3. It allows one Mercurial +repository to store references to external Mercurial (or potentially +other VCS) repositories, and to include the state of those external +repositories in the main repository's history. + +TortoiseHg 1.0 introduced rudimentary support for subrepositories, and +only in the commit / status tool. When Mercurial considers a subrepo as +dirty, it will appear in the commit tool as a special entry in the file +list with a status of *S*. If a subrepo is included in the file list of +a commit, the subrepo is committed along with the other changes, +updating the .hgsubstate file in the main repository root. + +Prior to TortoiseHg 1.0, dirty subrepos were not shown in the commit +tool and .hgsubstate was not updated during commits. + +  MQ patches  ----------  
Change 1 of 1 Show Entire File doc/​source/​debugging.txt Stacked
 
55
56
57
58
 
 
 
 
 
 
59
60
61
62
63
 
 
 
64
65
66
 
55
56
57
 
58
59
60
61
62
63
64
 
 
 
 
65
66
67
68
69
70
@@ -55,12 +55,16 @@
 for some info bits about Running and Testing Shell Extensions on Windows    The :command:`DbgView` tool from the SysInternals suite will capture -debug messages from the shell extension. +debug messages from the shell extension. However, the shell +extension does not emit debugging info by default. It must be enabled +by setting the registry key defined in +:file:`win32/shellext/DebugShellExt.reg` in the TortoiseHg source +repository. You can double-click on this file to load the key into your +registry.   -The :command:`ThgTaskbar` application's options dialog has an error -logging tab. If you have this dialog open while you are browsing -folders, you will get info and error level messages from the icon -overlay refresh process. +Another option is to exit the :command:`ThgTaskbar` system tray +application and start it from the command line. It will emit some debug +information to the console.    Nautilus  ~~~~~~~~