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

Parents b09c95acd56e…

Parents 08d901dc9e93…

by Steve Borho

Changes to 3 files · Browse files at b91ce58d49c4 Showing diff from parent b09c95acd56e 08d901dc9e93 Diff from another changeset...

Change 1 of 1 Show Entire File .hgignore Stacked
 
30
31
32
 
 
30
31
32
33
@@ -30,3 +30,4 @@
 glob:win32/shellext/Release/  glob:.DS_Store  glob:win32/*.reg +glob:*~
Change 1 of 1 Show Entire File contrib/​win32/​mercurial.iss Stacked
 
52
53
54
55
56
 
 
57
58
59
 
52
53
54
 
 
55
56
57
58
59
@@ -52,8 +52,8 @@
 Source: {app}\Mercurial.ini; DestDir: {app}\backup; Flags: external skipifsourcedoesntexist uninsneveruninstall  Source: contrib\win32\mercurial.ini; DestDir: {app}; DestName: Mercurial.ini; AfterInstall: FileExpandString('{app}\Mercurial.ini')  Source: ReleaseNotes.txt; DestDir: {app}; DestName: ReleaseNotes.txt -Source: ..\contrib\*.exe; DestDir: {app}; Flags: external skipifsourcedoesntexist -Source: ..\contrib\*.dll; DestDir: {app}; Flags: external skipifsourcedoesntexist +Source: ..\contrib\*.exe; DestDir: {app}; Flags: +Source: ..\contrib\*.dll; DestDir: {app}; Flags:  Source: ..\contrib\TortoiseOverlays\*.*; DestDir: {app}/TortoiseOverlays;  Source: contrib\refreshicons.cmd; DestDir: {app}/contrib  Source: dist\*.exe; DestDir: {app}; Flags: ignoreversion restartreplace uninsrestartdelete
Change 1 of 2 Show Entire File win32/​shellext/​QueryDirstate.cpp Stacked
 
54
55
56
 
57
58
59
 
60
61
62
 
237
238
239
 
240
241
242
243
 
244
245
246
 
54
55
56
57
58
59
60
61
62
63
64
 
239
240
241
242
243
244
245
246
247
248
249
250
@@ -54,9 +54,11 @@
    const std::string p = path + "\\.hg";   res = ::PathIsDirectory(p.c_str()) != 0; +#if 0   TDEBUG_TRACE(   "[" << cls << "] hasHgDir: PathIsDirectory(\"" << p << "\") -> " << res   ); +#endif   return res;  }   @@ -237,10 +239,12 @@
  return 0;   }   cur.isdir = stat.isdir; +#if 0   TDEBUG_TRACE(   dp << "stat.lstat(\"" << cur.path << "\") "   << "-> stat.isdir is " << stat.isdir   ); +#endif     if (cur.isdir)   {