Mercurial > hg
annotate contrib/wix/doc.wxs @ 20249:dc5157841361
rebase: improve error message for --base being empty or causing emptiness
Before it just said 'nothing to rebase'.
Now 'if "base" is an empty set:
abort: empty "base" revision set - can't compute rebase set
If the set of changesets to rebase can't be found from "base", it will fail as
before but with more explanation of what the problem was.
The name of the "base" option is not obvious - it is more like "samples
identifying the branch to rebase". The error messages for problems with the
specified "base" value will use that term and might thus also not be obvious,
but at least they are consistent with the option name. The name "base" will not
be used if the base only was specified implicitly as the working directory
parent.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Sun, 17 Nov 2013 18:21:58 -0500 |
parents | bd9bc4123920 |
children |
rev | line source |
---|---|
10513
47838dee7d60
contrib/wix: switch *.wxs files to LF eol
Adrian Buehlmann <adrian@cadifra.com>
parents:
10502
diff
changeset
|
1 <?xml version="1.0" encoding="utf-8"?> |
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:
10930
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> |
10930 | 8 <ComponentGroup Id="docFolder"> |
9 <ComponentRef Id="doc.hg.1.html" /> | |
10 <ComponentRef Id="doc.hgignore.5.html" /> | |
11 <ComponentRef Id="doc.hgrc.5.html" /> | |
12 <ComponentRef Id="doc.style.css" /> | |
13 </ComponentGroup> | |
10828
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
10513
diff
changeset
|
14 </Fragment> |
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
10513
diff
changeset
|
15 |
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
10513
diff
changeset
|
16 <Fragment> |
10930 | 17 <DirectoryRef Id="INSTALLDIR"> |
18 <Directory Id="docdir" Name="doc" FileSource="$(var.SourceDir)"> | |
13042
bd9bc4123920
wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
10930
diff
changeset
|
19 <Component Id="doc.hg.1.html" Guid="$(var.doc.hg.1.html.guid)" Win64='$(var.IsX64)'> |
10930 | 20 <File Name="hg.1.html" KeyPath="yes"> |
21 <Shortcut Id="hg1StartMenu" Directory="ProgramMenuDir" | |
22 Name="Mercurial Command Reference" | |
23 Icon="hgIcon.ico" IconIndex="0" Advertise="yes" | |
24 /> | |
25 </File> | |
26 </Component> | |
13042
bd9bc4123920
wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
10930
diff
changeset
|
27 <Component Id="doc.hgignore.5.html" Guid="$(var.doc.hgignore.5.html.guid)" Win64='$(var.IsX64)'> |
10930 | 28 <File Name="hgignore.5.html" KeyPath="yes"> |
29 <Shortcut Id="hgignore5StartMenu" Directory="ProgramMenuDir" | |
30 Name="Mercurial Ignore Files" | |
31 Icon="hgIcon.ico" IconIndex="0" Advertise="yes" | |
32 /> | |
33 </File> | |
34 </Component> | |
13042
bd9bc4123920
wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
10930
diff
changeset
|
35 <Component Id="doc.hgrc.5.html" Guid="$(var.doc.hgrc.5.html)" Win64='$(var.IsX64)'> |
10930 | 36 <File Name="hgrc.5.html" KeyPath="yes"> |
37 <Shortcut Id="hgrc5StartMenu" Directory="ProgramMenuDir" | |
38 Name="Mercurial Configuration Files" | |
39 Icon="hgIcon.ico" IconIndex="0" Advertise="yes" | |
40 /> | |
41 </File> | |
42 </Component> | |
13042
bd9bc4123920
wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
10930
diff
changeset
|
43 <Component Id="doc.style.css" Guid="$(var.doc.style.css)" Win64='$(var.IsX64)'> |
10930 | 44 <File Name="style.css" KeyPath="yes" /> |
45 </Component> | |
46 </Directory> | |
47 </DirectoryRef> | |
10828
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
10513
diff
changeset
|
48 </Fragment> |
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
10513
diff
changeset
|
49 |
10513
47838dee7d60
contrib/wix: switch *.wxs files to LF eol
Adrian Buehlmann <adrian@cadifra.com>
parents:
10502
diff
changeset
|
50 </Wix> |