Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

stable wix: add comment about TortoiseOverlaysMergeX64 merge conflict

Changeset 26b1b1144363…

Parent 0aa018d09c63…

by Adrian Buehlmann

Changes to one file · Browse files at 26b1b1144363 Showing diff from parent 0aa018d09c63 Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​wix/​tortoisehg.wxs Stacked
 
180
181
182
 
 
 
183
184
185
 
180
181
182
183
184
185
186
187
188
@@ -180,6 +180,9 @@
  <?elseif $(var.Platform) = "x64" ?>   <Merge Id='TortoiseOverlaysMergeX64' Language='0' DiskId='1'   SourceFile='..\contrib\TortoiseOverlays\TortoiseOverlays-1.0.11.18359-x64.msm' /> + <!-- TortoiseOverlaysMergeX64 is merge-incompatible with TortoiseOverlaysMergeX86 due to conflicting + component id's. So we cannot merge both, but ideally, we would + (see http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2446062) -->   <Directory Id="CommonFiles64Folder" Name="Programs64" >   <Directory Id="Common64" Name="TortoiseHg" >   <Component Id='thgshellx64dll' Guid='59FD2A49-BA62-40CC-B155-D11DB11EE611' Win64='yes'>