contrib/wix/help.wxs
author Tim Henigan <tim.henigan@gmail.com>
Tue, 27 Nov 2012 08:47:35 -0500
branchstable
changeset 17984 b74361cf7c0a
parent 16220 939f043ab5ed
child 26119 65d2538ac993
permissions -rw-r--r--
update: allow update to existing branches with invalid names (issue3710) Starting with 361ab1e2086f, users are no longer able to update a working copy to a branch named with a "bad" character (such as ':'). Prior to v2.4, it was possible to create branch names using "bad" characters, so this breaks backwards compatibility. Mercurial must allow users to update to existing branches with bad names. However, it should continue to prevent the creation of new branches with bad names. A test was added to confirm that 'hg update' works as expected. The test uses a bundled repo that was created with an earlier version of Mercurial.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
10828
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
     1
<?xml version="1.0" encoding="utf-8"?>
10513
47838dee7d60 contrib/wix: switch *.wxs files to LF eol
Adrian Buehlmann <adrian@cadifra.com>
parents: 10502
diff changeset
     2
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
10828
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
     3
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
     4
  <?include guids.wxi ?>
13042
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents: 12830
diff changeset
     5
  <?include defines.wxi ?>
10828
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
     6
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
     7
  <Fragment>
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
     8
    <DirectoryRef Id="INSTALLDIR">
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
     9
      <Directory Id="helpdir" Name="help" FileSource="$(var.SourceDir)">
13042
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents: 12830
diff changeset
    10
        <Component Id="helpFolder" Guid="$(var.helpFolder.guid)" Win64='$(var.IsX64)'>
10828
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    11
          <File Name="config.txt" KeyPath="yes" />
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    12
          <File Name="dates.txt" />
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    13
          <File Name="diffs.txt" />
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    14
          <File Name="environment.txt" />
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    15
          <File Name="extensions.txt" />
14819
b30c889584ef wix: catch up with more added files
Steve Borho <steve@borho.org>
parents: 13042
diff changeset
    16
          <File Name="filesets.txt" />
11491
159233cc9c14 wix: pick up new help topics added between 1.5 and 1.6
Steve Borho <steve@borho.org>
parents: 10828
diff changeset
    17
          <File Name="glossary.txt" />
14819
b30c889584ef wix: catch up with more added files
Steve Borho <steve@borho.org>
parents: 13042
diff changeset
    18
          <File Name="hgignore.txt" />
11491
159233cc9c14 wix: pick up new help topics added between 1.5 and 1.6
Steve Borho <steve@borho.org>
parents: 10828
diff changeset
    19
          <File Name="hgweb.txt" />
12790
6c619c2e8778 wix: add new merge-tools.txt help text
Steve Borho <steve@borho.org>
parents: 11491
diff changeset
    20
          <File Name="merge-tools.txt" />
10828
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    21
          <File Name="multirevs.txt" />
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    22
          <File Name="patterns.txt" />
16220
939f043ab5ed wix: add phases help text and two more translations (issue 3288)
Steve Borho <steve@borho.org>
parents: 14819
diff changeset
    23
          <File Name="phases.txt" />
10828
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    24
          <File Name="revisions.txt" />
11491
159233cc9c14 wix: pick up new help topics added between 1.5 and 1.6
Steve Borho <steve@borho.org>
parents: 10828
diff changeset
    25
          <File Name="revsets.txt" />
12830
d8205dacf9a3 wix: add subrepos help text
Steve Borho <steve@borho.org>
parents: 12790
diff changeset
    26
          <File Name="subrepos.txt" />
10828
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    27
          <File Name="templates.txt" />
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    28
          <File Name="urls.txt" />
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    29
        </Component>
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    30
      </Directory>
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    31
    </DirectoryRef>
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    32
  </Fragment>
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    33
10513
47838dee7d60 contrib/wix: switch *.wxs files to LF eol
Adrian Buehlmann <adrian@cadifra.com>
parents: 10502
diff changeset
    34
</Wix>