##// END OF EJS Templates
rebase: restrict rebase destination to the pulled set (issue5214)...
rebase: restrict rebase destination to the pulled set (issue5214) Before this patch, `hg pull --rebase` would be a strict sequence of `hg pull` followed by `hg rebase` if anything was pulled. Now that rebase pick his default destination the same way than merge, than `hg rebase` step would abort in the case the repo already had multiple anonymous heads (because of the ambiguity). (changed in fac3a24be50e) The intend of the user with `hg pull --rebase` is clearly to rebase on pulled content. This used to be (mostly) enforced by the former default destination for rebase, "tipmost changeset of the branch" as the tipmost would likely a changeset that just got pulled. But this intended was no longer enforced with the new defaul destination (unified with merge). This changeset makes use of the '_destspace' mechanism introduced in the previous changeset to enforce this. This partially fixes issue5214 as no change at all have been made to the new handling of the case with bookmark (unified with merge).

File last commit:

r13042:bd9bc412 stable
r29044:261c2537 stable
Show More
doc.wxs
50 lines | 1.9 KiB | text/plain | TextLexer
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 <?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828
<?include guids.wxi ?>
Steve Borho
wix: add support for x64 native MSI packages
r13042 <?include defines.wxi ?>
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828
<Fragment>
Adrian Buehlmann
wix updates...
r10930 <ComponentGroup Id="docFolder">
<ComponentRef Id="doc.hg.1.html" />
<ComponentRef Id="doc.hgignore.5.html" />
<ComponentRef Id="doc.hgrc.5.html" />
<ComponentRef Id="doc.style.css" />
</ComponentGroup>
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 </Fragment>
<Fragment>
Adrian Buehlmann
wix updates...
r10930 <DirectoryRef Id="INSTALLDIR">
<Directory Id="docdir" Name="doc" FileSource="$(var.SourceDir)">
Steve Borho
wix: add support for x64 native MSI packages
r13042 <Component Id="doc.hg.1.html" Guid="$(var.doc.hg.1.html.guid)" Win64='$(var.IsX64)'>
Adrian Buehlmann
wix updates...
r10930 <File Name="hg.1.html" KeyPath="yes">
<Shortcut Id="hg1StartMenu" Directory="ProgramMenuDir"
Name="Mercurial Command Reference"
Icon="hgIcon.ico" IconIndex="0" Advertise="yes"
/>
</File>
</Component>
Steve Borho
wix: add support for x64 native MSI packages
r13042 <Component Id="doc.hgignore.5.html" Guid="$(var.doc.hgignore.5.html.guid)" Win64='$(var.IsX64)'>
Adrian Buehlmann
wix updates...
r10930 <File Name="hgignore.5.html" KeyPath="yes">
<Shortcut Id="hgignore5StartMenu" Directory="ProgramMenuDir"
Name="Mercurial Ignore Files"
Icon="hgIcon.ico" IconIndex="0" Advertise="yes"
/>
</File>
</Component>
Steve Borho
wix: add support for x64 native MSI packages
r13042 <Component Id="doc.hgrc.5.html" Guid="$(var.doc.hgrc.5.html)" Win64='$(var.IsX64)'>
Adrian Buehlmann
wix updates...
r10930 <File Name="hgrc.5.html" KeyPath="yes">
<Shortcut Id="hgrc5StartMenu" Directory="ProgramMenuDir"
Name="Mercurial Configuration Files"
Icon="hgIcon.ico" IconIndex="0" Advertise="yes"
/>
</File>
</Component>
Steve Borho
wix: add support for x64 native MSI packages
r13042 <Component Id="doc.style.css" Guid="$(var.doc.style.css)" Win64='$(var.IsX64)'>
Adrian Buehlmann
wix updates...
r10930 <File Name="style.css" KeyPath="yes" />
</Component>
</Directory>
</DirectoryRef>
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 </Fragment>
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 </Wix>