Mercurial > hg
view tests/test-issue522 @ 10552:cc9f16a1f545 stable
contrib/wix: add COPYING.rtf
Moving the file from the misc directory of the thg-winbuild repo, which
uses mercurial's contrib/wix.
This file is displayed by the install UI sequence, so it belongs to the
WiX sources quite closely.
It happens to be installed by the msi installer, too.
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Thu, 25 Feb 2010 14:56:09 +0100 |
parents | 6c82beaaa11a |
children |
line wrap: on
line source
#!/bin/sh # In the merge below, the file "foo" has the same contents in both # parents, but if we look at the file-level history, we'll notice that # the version in p1 is an ancestor of the version in p2. This test # makes sure that we'll use the version from p2 in the manifest of the # merge revision. hg init repo cd repo echo foo > foo hg ci -qAm 'add foo' echo bar >> foo hg ci -m 'change foo' hg backout -r tip -m 'backout changed foo' hg up -C 0 touch bar hg ci -qAm 'add bar' hg merge --debug hg debugstate | grep foo hg st -A foo hg ci -m 'merge' hg manifest --debug | grep foo hg debugindex .hg/store/data/foo.i