Mercurial > hg
annotate contrib/wix/README.txt @ 21933:8ecbe55fd09d stable
largefiles: invoke "normallookup" on "lfdirstate" for merged files
Before this patch, largefiles gotten from "other" revision (with
conflict) at "hg merge" become "clean" unexpectedly in steps below:
1. "repo.status()" is invoked (for status check before merging)
1-1 "dirstate" entry for standinfile SF is "normal"-ed
1-2 "lfdirstate" entry of largefile LF (for SF) is "normal"-ed
2. "merge.update()" is invoked
2-1 SF is updated in the working directory
(ASSUMPTION: user choice "other" at conflict)
2-2 "dirstate" entry for SF is "merge"-ed
3. "lfcommands.updatelfiles()" is invoked (by "overrides.hgmerge()")
3-1 largefile LF (for SF) is updated in the working directory
3-2 "dirstate" returns "m" for SF (by 2-2)
3-3 "lfdirstate" entry for LF is left as it is
3-4 "lfdirstate" is written into ".hg/largefiles/dirstate", and
timestamp of LF is stored into "lfdirstate" file (by 1-2)
(ASSUMPTION: timestamp of LF differs from one of "lfdirstate" file)
Then, "hs status" treats LF as "clean", even though LF is updated by
"other" revision (by 3-1), because "lfilesrepo.status()" always treats
"normal"-ed files (by 1-2 and 3-4) as "clean".
When state of standinfile in "dirstate" is "m", largefile should be
"normallookup"-ed.
This patch invokes "normallookup" on "lfdirstate" for merged files.
This patch uses "[debug] dirstate.delaywrite" feature in the test, to
ensure that timestamp of the largefile gotten from "other" revision is
stored into ".hg/largefiles/dirstate". (for ASSUMPTION at 3-4)
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Wed, 23 Jul 2014 00:10:24 +0900 |
parents | 98166640b356 |
children | 765f836a9484 |
rev | line source |
---|---|
10502
1e022c88a0a5
Add WiX installer scripts to contrib/wix
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
1 WiX installer source files |
1e022c88a0a5
Add WiX installer scripts to contrib/wix
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
2 ========================== |
1e022c88a0a5
Add WiX installer scripts to contrib/wix
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
3 |
1e022c88a0a5
Add WiX installer scripts to contrib/wix
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
4 The files in this folder are used by the thg-winbuild [1] package |
1e022c88a0a5
Add WiX installer scripts to contrib/wix
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
5 building architecture to create a Mercurial MSI installer. These files |
1e022c88a0a5
Add WiX installer scripts to contrib/wix
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
6 are versioned within the Mercurial source tree because the WXS files |
1e022c88a0a5
Add WiX installer scripts to contrib/wix
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
7 must kept up to date with distribution changes within their branch. In |
1e022c88a0a5
Add WiX installer scripts to contrib/wix
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
8 other words, the default branch WXS files are expected to diverge from |
1e022c88a0a5
Add WiX installer scripts to contrib/wix
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
9 the stable branch WXS files. Storing them within the same repository is |
17251
98166640b356
help: fix some instances of 'the the'
Mads Kiilerich <mads@kiilerich.com>
parents:
10503
diff
changeset
|
10 the only sane way to keep the source tree and the installer in sync. |
10502
1e022c88a0a5
Add WiX installer scripts to contrib/wix
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
11 |
1e022c88a0a5
Add WiX installer scripts to contrib/wix
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
12 The MSI installer builder uses only the mercurial.ini file from the |
1e022c88a0a5
Add WiX installer scripts to contrib/wix
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
13 contrib/win32 folder, the contents of which have been historically used |
1e022c88a0a5
Add WiX installer scripts to contrib/wix
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
14 to create an InnoSetup based installer. The rest of the files there are |
1e022c88a0a5
Add WiX installer scripts to contrib/wix
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
15 ignored. |
1e022c88a0a5
Add WiX installer scripts to contrib/wix
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
16 |
1e022c88a0a5
Add WiX installer scripts to contrib/wix
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
17 The MSI packages built by thg-winbuild require elevated (admin) |
1e022c88a0a5
Add WiX installer scripts to contrib/wix
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
18 privileges to be installed due to the installation of MSVC CRT libraries |
10503
bbf22812e8ad
contrib/wix: MSVC CRT libraries are installed in WinSxS
Adrian Buehlmann <adrian@cadifra.com>
parents:
10502
diff
changeset
|
19 under the C:\WINDOWS\WinSxS folder. Thus the InnoSetup installers may |
bbf22812e8ad
contrib/wix: MSVC CRT libraries are installed in WinSxS
Adrian Buehlmann <adrian@cadifra.com>
parents:
10502
diff
changeset
|
20 still be useful to some users. |
10502
1e022c88a0a5
Add WiX installer scripts to contrib/wix
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
21 |
1e022c88a0a5
Add WiX installer scripts to contrib/wix
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
22 To build your own MSI packages, clone the thg-winbuild [1] repository |
1e022c88a0a5
Add WiX installer scripts to contrib/wix
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
23 and follow the README.txt [2] instructions closely. There are fewer |
1e022c88a0a5
Add WiX installer scripts to contrib/wix
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
24 prerequisites for a WiX [3] installer than an InnoSetup installer, but |
1e022c88a0a5
Add WiX installer scripts to contrib/wix
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
25 they are more specific. |
1e022c88a0a5
Add WiX installer scripts to contrib/wix
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
26 |
1e022c88a0a5
Add WiX installer scripts to contrib/wix
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
27 Direct questions or comments to Steve Borho <steve@borho.org> |
1e022c88a0a5
Add WiX installer scripts to contrib/wix
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
28 |
1e022c88a0a5
Add WiX installer scripts to contrib/wix
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
29 [1] http://bitbucket.org/tortoisehg/thg-winbuild |
1e022c88a0a5
Add WiX installer scripts to contrib/wix
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
30 [2] http://bitbucket.org/tortoisehg/thg-winbuild/src/tip/README.txt |
1e022c88a0a5
Add WiX installer scripts to contrib/wix
Steve Borho <steve@borho.org>
parents:
diff
changeset
|
31 [3] http://wix.sourceforge.net/ |