annotate contrib/wix/defines.wxi @ 33886:13dc7f29531e

exchange: don't attempt phase exchange if phase-heads was in bundle The Mercurial core server doesn't yet include phase-heads parts in the bundle, but our Google-internal server wants to do that. Unfortunately, the usual exchange still happens even if phase-heads part is included (including the short-circuited one for old/publishing servers). That means that even if our server (again, the Google-internal one, but also future Mercurial core servers) includes a phase-heads part to indicate that some heads should be drafts, that would still get overwritten by the phase updating that happens after. So let's fix that by marking the phase step done if we receive at least one phase-heads part in the bundle. Differential Revision: https://phab.mercurial-scm.org/D440
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 17 Aug 2017 13:04:47 -0700
parents bd9bc4123920
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
13042
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
diff changeset
1 <Include>
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
diff changeset
2
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
diff changeset
3 <?if $(var.Platform) = "x64" ?>
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
diff changeset
4 <?define IsX64 = yes ?>
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
diff changeset
5 <?else?>
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
diff changeset
6 <?define IsX64 = no ?>
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
diff changeset
7 <?endif?>
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
diff changeset
8
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
diff changeset
9 </Include>