contrib/wix/defines.wxi
author Martin von Zweigbergk <martinvonz@google.com>
Fri, 14 Jul 2017 14:30:55 -0700
changeset 33678 855a1856466d
parent 13042 bd9bc4123920
permissions -rw-r--r--
tests: demonstrate crash when trying to rebase merge without its parents As the test case shows, when "hg rebase -d G -r 'B + D + F'" is run on the following graph, we crash with traceback. It's reasonable to fail because we can not easily produce a correct rebased F. The problem is what diff to apply to either the rebased B or the rebased D. We could potentially produce the result by e.g. applying the (F-D) diff to the rebased B and then applying the reverse (E-D) diff on top, but that could result in merge conflicts in each of those steps, which we don't have a way of dealing with. So for now, let's just add a test case to demonstrate that we crash (i.e. the AssertionError is clearly incorrect since the user can run into it). F /| C E | | B D G \|/ A Differential Revision: https://phab.mercurial-scm.org/D212
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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>