Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:corrections on merge conflict handling for settings help
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | StvPrivateHook2
Files: files | file ages | folders
SHA1:309168a936d404a0ff4cddcd6e75c1f467c9a00a
User & Date: wolfgang 2010-10-27 20:27:57
Context
2010-10-27
20:39
added missing dependency in dmc windows make for resource file check-in: 304c71a0 user: wolfgang tags: StvPrivateHook2
20:27
corrections on merge conflict handling for settings help check-in: 309168a9 user: wolfgang tags: StvPrivateHook2
18:04
merge from trunk check-in: f5740d09 user: wolfgang tags: StvPrivateHook2
Changes

Changes to src/db.c.

1595
1596
1597
1598
1599
1600
1601




1602
1603
1604
1605
1606
1607
1608
....
1638
1639
1640
1641
1642
1643
1644





1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
**                  Example:  *.o,*.obj,*.exe
**
**    localauth     If enabled, require that HTTP connections from
**                  127.0.0.1 be authenticated by password.  If
**                  false, all HTTP requests from localhost have
**                  unrestricted access to the repository.
**




**    mtime-changes Use file modification times (mtimes) to detect when
**                  files have been modified.  (Default "on".)
**
**    pgp-command   Command used to clear-sign manifests at check-in.
**                  The default is "gpg --clearsign -o ".
**
**    proxy         URL of the HTTP proxy.  If undefined or "off" then
................................................................................
**                  a push, the push hook command will be executed. This
**                  might be a prefix of the pattern, sent by the client.
**
**    push-hook-privilege
**                  if set, the user doing the push needs this privilege
**                  to trigger the hook. Valid privileges are:
**                    s (setup), a (admin), i (checkin) or o (checkout)





**
**    ssh-command   Command used to talk to a remote machine with
**                  the "ssh://" protocol.
**
**    repo-cksum       Compute checksums over all files in each checkout
**                     as a double-check of correctness.  Defaults to "on".
**                     Disable on large repositories for a performance
**                     improvement.
**
**    web-browser   A shell command used to launch your preferred
**                  web browser when given a URL as an argument.
**                  Defaults to "start" on windows, "open" on Mac,
**                  and "firefox" on Unix.
**
** There is a simple form in the administration gui for these settings:
**  *  Go to the <a href="setup">Admin</a> page







>
>
>
>







 







>
>
>
>
>




<
<
<
<
<







1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
....
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657





1658
1659
1660
1661
1662
1663
1664
**                  Example:  *.o,*.obj,*.exe
**
**    localauth     If enabled, require that HTTP connections from
**                  127.0.0.1 be authenticated by password.  If
**                  false, all HTTP requests from localhost have
**                  unrestricted access to the repository.
**
**    manifest      If enabled, automatically create files "manifest" and
**                  "manifest.uuid" in every checkout.  The SQLite and
**                  Fossil repositories both require this.  Default: off.
**
**    mtime-changes Use file modification times (mtimes) to detect when
**                  files have been modified.  (Default "on".)
**
**    pgp-command   Command used to clear-sign manifests at check-in.
**                  The default is "gpg --clearsign -o ".
**
**    proxy         URL of the HTTP proxy.  If undefined or "off" then
................................................................................
**                  a push, the push hook command will be executed. This
**                  might be a prefix of the pattern, sent by the client.
**
**    push-hook-privilege
**                  if set, the user doing the push needs this privilege
**                  to trigger the hook. Valid privileges are:
**                    s (setup), a (admin), i (checkin) or o (checkout)
**
**    repo-cksum    Compute checksums over all files in each checkout
**                  as a double-check of correctness.  Defaults to "on".
**                  Disable on large repositories for a performance
**                  improvement.
**
**    ssh-command   Command used to talk to a remote machine with
**                  the "ssh://" protocol.
**





**    web-browser   A shell command used to launch your preferred
**                  web browser when given a URL as an argument.
**                  Defaults to "start" on windows, "open" on Mac,
**                  and "firefox" on Unix.
**
** There is a simple form in the administration gui for these settings:
**  *  Go to the <a href="setup">Admin</a> page