Mercurial > hg
view tests/test-double-merge @ 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 | 6d36fc70754e |
children |
line wrap: on
line source
#!/bin/sh hg init repo cd repo echo line 1 > foo hg ci -qAm 'add foo' -d "1000000 0" # copy foo to bar and change both files hg cp foo bar echo line 2-1 >> foo echo line 2-2 >> bar hg ci -m 'cp foo bar; change both' -d "1000000 0" # in another branch, change foo in a way that doesn't conflict with # the other changes hg up -qC 0 echo line 0 > foo hg cat foo >> foo hg ci -m 'change foo' -d "1000000 0" # we get conflicts that shouldn't be there hg merge -P hg merge --debug echo "-- foo --" cat foo echo "-- bar --" cat bar