[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] net.venge.monotone.mingw-instructions: 746e9a2
|
From: |
code |
|
Subject: |
[Monotone-commits-diffs] net.venge.monotone.mingw-instructions: 746e9a2796d3eee1a77ecaf7b4461d6f999d7ddf |
|
Date: |
Mon, 10 Jan 2011 13:51:32 GMT |
revision: 746e9a2796d3eee1a77ecaf7b4461d6f999d7ddf
date: 2011-01-10T13:50:27
author: Timothy Brownawell <address@hidden>
branch: net.venge.monotone.mingw-instructions
changelog:
propagate from branch 'net.venge.monotone' (head
3903ea47e7b1a656e0695f10d57bc0e9deca205b)
to branch 'net.venge.monotone.mingw-instructions' (head
da23e38a906478e3b015a74a6041f5922cc2f35f)
manifest:
format_version "1"
new_manifest [22f9181c1be9b8d225f6eb09f2fa2d4b49be4e5c]
old_revision [3903ea47e7b1a656e0695f10d57bc0e9deca205b]
patch "INSTALL_windows_native.txt"
from [7f2c5080adf14266d8949975f95c8e97dd8b7f0c]
to [58778b6df48ac69f8fda2662e2ed2735b19d360a]
old_revision [da23e38a906478e3b015a74a6041f5922cc2f35f]
patch "monotone.texi"
from [583f23e1b6e154ec64db813a8235a9aa03b35875]
to [e376b6b2d07736f11fce16a5ff1b82e29da95ed3]
patch "po/sv.po"
from [66e25c913d0ac84d429945643c9d2353881670f7]
to [a65ff2d3e93bbd1860a57ca7f85826ca17c1e3fd]
============================================================
--- INSTALL_windows_native.txt 7f2c5080adf14266d8949975f95c8e97dd8b7f0c
+++ INSTALL_windows_native.txt 58778b6df48ac69f8fda2662e2ed2735b19d360a
@@ -2,53 +2,46 @@
on Windows (using MinGW):
-Many tools and packages are available on the SourceForge MinGW
-download site:
+Many tools and packages are available on SourceForge:
-https://sourceforge.net/projects/mingw/files/
+https://sourceforge.net/projects/<project>/files/
That site is organized into several hierarchical lists of files. We
give the hierarchy names here, rather than a complete download URL, to
-make it easy to check for new versions. The versions given here were
-used to build the current release of monontone.
+make it easy to check for new versions.
-Trying a new version of Boost can be dangerous.
+The versions given here may not be exactly the same versions as used to
+build the current release of monontone.
These instructions work on a new computer, with only
Windows XP installed.
-Package | Version | location
+Package | Version | location
--------------------------
-MingGW | 5.1.4 | Automated MinGW Installer | MinGW 5.1.4 | MinGW-5.1.4.exe
-MSYS | 1.0.11 | MSYS Base System | msys-1.0.11 | MSYS-1.0.11.exe
-msysDTK | 1.0.1 | MSYS Supplementary Tools | msysDTK-1.0.1 | msysDTK-1.0.1.exe
-libiconv | 1.13 | MinGW libiconv | Release 1.13 |
- | | libiconv-1.13-mingw32-bin.tar.gz
- | | libiconv-1.13-mingw32-dev.tar.gz
- | | libiconv-1.13-mingw32-dll-2.tar.gz
-autoconf | 2.63 | MSYS autoconf | autoconf-2.63-1 | autoconf-2.63-1-msys-1.0.11-bin.tar.lzma
-automake | 1.11 | MSYS automake | automake-1.11-1 | automake-1.11-1-msys-1.0.11-bin.tar.lzma
-zlib | 1.2.3 | zlib-1.2.3-1-mingw32 |
- | | libz-1.2.3-1-mingw32-dev.tar.gz
- | | libz-1.2.3-1-mingw32-dll-1.tar.gz
-gcc dll | | GCC Version 4 | Current Release_gcc-4.4.0 | gcc-core-4.4.0-mingw32-dll.tar.gz
-gettext | 0.17 | MinGW gettext | gettext-0.17-1 |
- | | gettext-0.17-1-mingw32-bin.tar.lzma
- | | gettext-0.17-1-mingw32-dev.tar.lzma
- | | libgettextpo-0.17-1-mingw32-dll-0.tar.lzma
- | | libintl-0.17-1-mingw32-dll-8.tar.lzma
-boost | 1.34.1 | http://prdownloads.sf.net/boost/boost_1_34_1.tar.bz2?download
-Lua | 5.1.4 | http://www.lua.org/ | lua-5.1.4.tar.gz
-pcre | 7.8 | http://www.pcre.org/ | pcre-7.8.tar.bz2
-botan | 1.8.4 | http://botan.randombit.net/download.html | Botan-1.8.4.tbz
-sqlite3 | 3.6.16 | http://www.sqlite.org/download.html | sqlite-amalgamation-3.6.16.tar.gz, with makefile
-libidn | 1.9 | ftp://ftp.gnu.org/gnu/libidn | libidn-1.9.tar.gz
-Depends.exe| | http://www.dependencywalker.com/ ; also comes with Visual Studio
+Python | 2.7.1 | http://www.python.org/
+ | "Windows Installer" under "Quick Links (2.7.1)"
+mingw-get-inst| latest | http://sourceforge.net/projects/mingw/files/
+ | -> Automated MinGW Installer
+ | -> mingw-get-inst
+ | -> mingw-get-inst-20101030
+ | -> mingw-get-inst-20101030.exe
+boost | 1.45.1 | http://sourceforge.net/projects/boots/files/
+ | -> boost -> 1.54.0 -> boost_1_45_0.tar.gz
+Lua | 5.1.4 | http://www.lua.org/
+ | -> download
+ | -> "...current release is >Lua 5.1.4<" under "Source"
+ | lua-5.1.4.tar.gz
+pcre | 8.11 | http://www.pcre.org/
+ | -> ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
+ | -> pcre-8.11.tar.gz
+botan | 1.8.11 | http://botan.randombit.net/download.html
+ | "Source: >tar/gzip<" under "Current Stable Release"
+sqlite3 | 3.7.4 | http://www.sqlite.org/download.html
+ | -> sqlite-autoconf-3070400.tar.gz
+libidn | 1.19 | ftp://ftp.gnu.org/gnu/libidn/
+ | -> libidn-1.19.tar.gz
+Depends.exe | | http://www.dependencywalker.com/ ; also comes with Visual Studio
-msysDTK installs autoconf, automake, Perl, CVS, crypt, and
-other tools needed by the autoconf tools.
-
-However, monotone requires a newer autoconf and automake.
In general, there are two versions of most tools on the
MinGW site; mingw and msys. MinGW versions are intended to
be run from a DOS shell, msys versions from an Msys shell.
@@ -64,98 +57,102 @@
postscript format, which requires tools not (yet) available
for MinGW.
-1. MinGW - run installer, accept defaults but add g++ on the package selection page (installs to c:/MinGW)
-2. MSYS - run installer, accept defaults (installs to c:/Msys/1.0)
-3. msysDTK - run installer, accept defaults (installs to c:/Msys/1.0)
+The commands below assume you download files to C:\MinGW\Msys\1.0\ , which
+maps to both / and /usr/ under the MinGW shell.
-4. libiconv
- start the Msys shell.
- $ cd /mingw
- $ tar zxf libiconv-1.13-mingw32-bin.tar.gz
- $ tar zxf libiconv-1.13-mingw32-dev.tar.gz
- $ tar zxf libiconv-1.13-mingw32-dll-2.tar.gz
+01. Python (needed for the Botan configure script)
+ 01.1 Run the installer, accept all defaults.
+ 01.2 Add python to your PATH
+ Right-click on "My Computer", select "Properties"
+ Go to the "Advanced" tab, and click on "Environment Variables"
+ To add Python to everyone's path:
+ Select "Path" (case-insensitive) in the "System variables" at the botton.
+ Click "Edit".
+ Add ";C:\Python27" (without the quotes) to the end of the value.
+ To add Python to only your path:
+ If there is a "Path" entry in the "User variables for ..." section,
+ edit it as above.
+ If there is not a "Path" entry, click on "New" in the User variables section,
+ and enter "PATH" as the variable name and "C:\Python27" as the value.
+ To verify your new PATH, you can go to Start->Run and enter "cmd", then in the
+ command window run "echo %PATH%" and look for the Python directory in the output.
-5. autoconf
- $ cd /
- $ tar --lzma -xf autoconf-2.63-1-msys-1.0.11-bin.tar.lzma
+02. MinGW
+ Run mingw-get-inst (graphical installer for mingw-get and the MinGW base system).
+ At the "Select Components" screen, add "C++ compiler" and "MinGW Developer Toolkit".
+ Other than this, accept all defaults.
+ Open the MinGW shell (Start->All Programs->MinGW->MinGW Shell)
+ Run the following:
+ $ mingw-get install msys-autoconf msys-automake mingw32-libiconv
+ $ mingw-get install mingw32-zlib mingw32-libz-dev mingw32-gettext
-6. automake
- $ cd /
- $ tar --lzma -xf automake-1.11-1-msys-1.0.11-bin.tar.lzma
-
-7. zlib
- $ cd /mingw
- $ tar zxf libz-1.2.3-1-mingw32-dev.tar.gz
- $ tar zxf libz-1.2.3-1-mingw32-dll-1.tar.gz
- $ cp bin/libz-1.dll bin/zlib1.dll
-
-8. gettext
- $ cd /mingw
- $ tar --lzma -xf gettext-0.17-1-mingw32-bin.tar.lzma
- $ tar --lzma -xf gettext-0.17-1-mingw32-dev.tar.lzma
- $ tar --lzma -xf libgettextpo-0.17-1-mingw32-dll-0.tar.lzma
- $ tar --lzma -xf libintl-0.17-1-mingw32-dll-8.tar.lzma
- $ tar zxf gcc-core-4.4.0-mingw32-dll.tar.gz
-
-9. boost; only need headers
+03. boost; only need headers
$ cd /usr
$ mkdir src
$ cd src
- $ tar jxf boost_1_34_1.tar.bz2
- $ cd boost_1_34_1
+ $ tar -zxf ../boost_1_45_1.tar.gz
+ This may give errors about gid_t out of range, and then say
+ "Exiting with failure status due to previous errors"; you can
+ ignore this.
+ $ cd boost_1_45_1
$ cp -a boost /mingw/include
-10. Lua
+04. Lua
$ cd /usr/src
- $ tar zxf lua-5.1.4.tar.gz
+ $ tar -zxf ../lua-5.1.4.tar.gz
$ cd lua-5.1.4
$ make mingw INSTALL_TOP=/mingw
$ make install INSTALL_TOP=/mingw
-11. pcre
+05. pcre
$ cd /usr/src
- $ tar jxf pcre-7.8.tar.bz2
- $ cd pcre-7.8
+ $ tar -zxf ../pcre-8.11.tar.gz
+ $ cd pcre-8.11
$ ./configure --prefix=/mingw
$ make install
-12. botan
- 12.1 unpack, configure:
- $ cd /usr/src
- $ tar jxf Botan-1.8.4.tbz
- $ cd Botan-1.8.4
- $ ./configure.pl --with-tr1=none
- 12.2 edit Makefile, delete -ansi from LANG_FLAGS
- 12.3 install:
- $ make install
+06. botan
+ $ cd /usr/src
+ $ tar -zxf ../Botan-1.8.11.tgz
+ $ cd Botan-1.8.11
+ $ ./configure.py --cc=gcc --os=mingw
+ The Botan configure script generates paths with Python's
+ os.path.join(...), which in the case of the Windows Python
+ we installed uses '\' as the path separator. There are a
+ couple of places in the Makefile where this causes problems.
+ $ sed -i 's#\\\(.\)#/\1#g' Makefile
+ $ make install
-13. sqlite3
+07. sqlite3
$ cd /usr/src
- $ tar zxf sqlite-amalgamation-3.6.16.tar.gz
- $ cd sqlite-3.6.16
+ $ tar -zxf ../sqlite-autoconf-3070400.tar.gz
+ $ cd sqlite-autoconf-3070400
$ ./configure --prefix=/mingw
$ make install
-14. libidn
+08. libidn
$ cd /usr/src
- $ tar zxf libidn-1.9.tar.gz
- $ cd libidn-1.9
+ $ tar -zxf ../libidn-1.19.tar.gz
+ $ cd libidn-1.19
$ ./configure --prefix=/mingw
$ make install
-15. Depends.exe
+09. Depends.exe
If you have Visual Studio installed, you should be able to skip this.
If you don't, then download the appropriate depends*.zip and
- unpack it someplace in your %PATH%.
+ unpack it someplace in your %PATH% (for example, C:\MinGW\bin\).
This is only used by the testsuite, in particular the empty_environment test.
If you just want to build monotone for your own use, you can skip this and
just ignore that that test fails.
-16. build monotone
+10. build monotone
+ You can skip the CXXFLAGS and LDFLAGS if you really want to, but if you do that
+ then libgcc_s and libstdc++-6 will be linked dynamically and the resulting
+ monotone binary will take several extra seconds to start.
$ cd /c/.../monotone
- $ export PATH=/bin:/mingw/bin
- $ autoreconf -i
- $ touch config.h.in
- $ ./configure sqlite3_LIBS=-lsqlite3
+ $ autoreconf -i # not needed if you use the distributed tarball
+ $ CXXFLAGS="-static-libgcc -static-libstdc++ -O2 -Wall"; export CXXFLAGS
+ $ LDFLAGS="-static-libgcc -static-libstdc++"; export LDFLAGS
+ $ ./configure
$ make
============================================================
--- monotone.texi 583f23e1b6e154ec64db813a8235a9aa03b35875
+++ monotone.texi e376b6b2d07736f11fce16a5ff1b82e29da95ed3
@@ -3210,7 +3210,7 @@ @section Merge Conflicts
specify resolutions for some conflicts. The resolutions are stored in a
file, and given to the @command{merge} command via the
@command{--resolve-conflicts-file=filename} or
address@hidden option; see @xref{Conflicts}.
address@hidden option; see @ref{Conflicts}.
The @command{merge} command normally will perform as many merges as
necessary to merge all current heads of a branch. However, when
@@ -3688,7 +3688,8 @@ @section Quality Assurance
or deny trust to the assertion made by the cert.
The evaluation of testresults is controlled by the
address@hidden hook. This hook is called when
address@hidden hook (see @ref{accept_testresult_change}).
+This hook is called when
selecting update candidates, and is passed a pair of tables describing
the @code{testresult} certs present on the source and proposed
destination of an update. Only if the change in test results are
@@ -5794,12 +5795,13 @@ @section Network
@ftable @command
@item mtn serve address@hidden:@var{port}]]
address@hidden mtn pull [--[no-]set-default] [--dry-run] address@hidden
address@hidden mtn push [--[no-]set-default] [--dry-run] address@hidden address@hidden
address@hidden mtn sync [--[no-]set-default] [--dry-run] address@hidden address@hidden
address@hidden mtn pull [--[no-]set-default] [--[no-]dry-run] address@hidden
address@hidden mtn push [--[no-]set-default] [--[no-]dry-run] address@hidden address@hidden
address@hidden mtn sync [--[no-]set-default] [--[no-]dry-run] address@hidden address@hidden
@itemx mtn pull [--[no-]set-default] address@hidden address@hidden [...] address@hidden @strong{deprecated}
@itemx mtn push [--[no-]set-default] address@hidden address@hidden address@hidden [...] address@hidden @strong{deprecated}
@itemx mtn sync [--[no-]set-default] address@hidden address@hidden address@hidden [...] address@hidden @strong{deprecated}
+See the online help for more options.
These commands operate the ``netsync'' protocol built into
monotone. This is a custom protocol for rapidly synchronizing two
@@ -5825,17 +5827,17 @@ @section Network
that the transport channel in use already provides sufficient
authentication and authorization facilities.
-The @var{uri-or-address} arguments given to @command{push},
address@hidden, and @command{sync} can be of two possible forms.
-
If @option{--dry-run} is given, the connection is made, but no data is
transferred. Instead, a summary of what would be transferred is
output; the number of revisions, certs and keys that would be sent and
received. For sent revisions, the branch names are also output.
+The @var{uri-or-address} arguments given to @command{push},
address@hidden, and @command{sync} can be of two possible forms.
+
If the argument is an URI, the Lua hook
address@hidden may transform it into a connection
-command, which is later executed as transport channel for netsync.
address@hidden may transform it into a connection
+command, which is later executed as the transport channel for netsync.
The URI itself consists of a connection scheme, an optional user (only
used for @code{ssh}-related transports), a host with an optional port
(which both might be optional as well, f.e. for the @code{file}
@@ -5859,16 +5861,20 @@ @section Network
@end group
@end smallexample
address@hidden:} and @code{ssh:} are not supported on Windows native, but
+they are supported on Windows Cygwin.
+
If the server has a multi-host setup, the path component of the URI
might be used to distinguish between different databases (please ask the
-provider of the setup for details).
+provider of the server for details).
-If the argument is a simple hostname (with optional port number), monotone
-will fall back to the @code{mtn} URI scheme, i.e. use a TCP socket to the
-specified host and port. The @var{glob} parameters then indicate a set of
-branches to exchange. Multiple @var{glob} and @option{--exclude} options
-can be specified. @strong{Important notice:} This call syntax is deprecated
-and subject of removal in future versions of monotone!
+For backward compatibility, if the argument is a simple hostname (with
+no scheme, but with optional port number), monotone will default to
+the @code{mtn:} URI scheme, i.e. use a TCP socket to the specified
+host and port. The @var{glob} parameters then indicate a set of
+branches to exchange. Multiple @var{glob} and @option{--exclude}
+options can be specified. @strong{Important notice:} This call syntax
+is deprecated and subject to removal in future versions of monotone!
For both syntaxes, every branch which matches a @var{glob} or branch pattern
exactly, and does not match an @var{exclude-glob} or exclude pattern, will be
@@ -5898,10 +5904,10 @@ @section Network
databases.
The @command{pull}, @command{push}, and @command{sync} commands only
-require you pass @var{uri} (or @var{address} and @var{glob}) the first time
-you use one of them; monotone will memorize this use and in the future default
-to the same URI (or server and glob). For instance, if Bob wants to
address@hidden with Alice again, he can simply run:
+require you pass @var{uri} the first time you use one of them;
+monotone will store this in the database and in the future default to
+the same URI. For instance, if Bob wants to @command{sync} with Alice
+again, he can simply run:
@smallexample
@group
@@ -5917,44 +5923,49 @@ @section Network
make the new default.
The @command{serve} command doesn't care about workspaces, so even if
-you stand in one, you will have to give it the database to server, the
-server key to use and the key directory explicitely, or otherwise, it
-will take the defaults it would use when you don't stand in a
-workspace.
+you stand in one, you will have to give it the database to serve, the
+server key to use and the key directory explicitly.
In the server, different permissions can be applied to each branch;
see @ref{get_netsync_read_permitted} and
@ref{get_netsync_write_permitted}.
-If a @option{--pid-file} option is specified, the command
address@hidden will create the specified file and record the process
-identifier of the server in the file. This file can then be read to
-identify specific monotone server processes.
+If @option{--pid-file} is specified, @command{serve} will create the
+specified file and record the process identifier of the server in the
+file. This file can then be read to identify specific monotone server
+processes.
-The syntax for patterns, both in globs as well as URIs, is very simple.
address@hidden matches 0 or more arbitrary characters. @code{?} matches exactly
-1 arbitrary character (you need to escape that with @code{%3F} in an URI).
address@hidden@{foo,bar,address@hidden matches ``foo'', or ``bar'', or ``baz''. These
-can be combined arbitrarily. A backslash, @code{\}, can be prefixed to
-any character, to match exactly that character --- this might be useful
-in case someone, for some odd reason, decides to put a ``*'' into their
-branch name.
+The syntax for patterns is very simple. @code{*} matches 0 or more
+arbitrary characters. @code{?} matches exactly 1 arbitrary character
+(you need to escape that with @code{%3F} in a URI). @address@hidden,@}}
+matches alternatives; @address@hidden,bar,address@hidden matches ``foo'', or
+``bar'', or ``baz''. These can be combined arbitrarily. A backslash
+(@code{\}) escapes these special characters, to match exactly that
+character; this might be useful in case someone, for some odd
+reason, decides to put a ``*'' into their branch name.
address@hidden mtn clone @var{uri} address@hidden address@hidden
address@hidden mtn clone @var{address}[:@var{port}] @var{branchname} address@hidden
address@hidden mtn clone @var{uri} address@hidden address@hidden address@hidden
address@hidden mtn clone @var{address}[:@var{port}] @var{branchname} address@hidden @strong{deprecated}
@command{clone} is a helper command that performs the roles of a
-number of other commands all at once. Firstly, it constructs a new
+number of other commands all at once. First, it constructs a new
database. If no database is given, the configured default database is
created or re-used (see @ref{get_default_database_alias} for more
-details). Then it populates this database by @command{pull}ing any
-data which match the branch pattern in the @var{uri} or the given
address@hidden argument from the remote database. Finally, it
-copies the files out of the newly created database into a local
-directory, just as @command{checkout} would. If no @var{directory} is
-given, the @var{branchname} is used as directory.
+details; @file{~/.monotone/default.mtn} by default). Then it populates
+this database by @command{pull}ing any data which match the branch
+pattern in the @var{uri} argument from the remote database.
+The branch pattern must specify a single branch; @command{clone} uses
+that to determine which branch to checkout.
+
+Finally, @command{clone} copies the files out of the newly created
+database into a local directory, just as @command{checkout} would. If
+no @var{directory} is given, the @var{branchname} is used as
+directory. If @command{--revision} is given, that revision must be on
+the specified branch, and is checked out; otherwise the head of the
+branch is checked out.
+
@strong{Important notice:} The @var{address}[:@var{port}] @var{branchname}
-call syntax is deprecated and subject of removal in future versions of monotone!
+call syntax is deprecated and subject to removal in future versions of monotone!
@end ftable
@@ -6162,7 +6173,9 @@ @section Informative
Displays help about commands and options.
@item mtn list branches address@hidden address@hidden
address@hidden mtn ls
address@hidden mtn ls branches
address@hidden branches} is an alias for @command{list branches}.
+
This command lists all known branches in your database. If
@var{pattern} is provided, it is used as a glob to select the branches
listed, otherwise all branches are listed. If @option{-exclude}
@@ -6170,9 +6183,10 @@ @section Informative
branches.
@item mtn list certs @var{id}
address@hidden mtn ls
address@hidden mtn ls certs
address@hidden certs} is an alias for @command{list certs}.
-These commands will print out a list of certificates associated with
+This command will print out a list of certificates associated with
a particular revision @var{id}. Each line of the print out will
indicate:
@itemize
@@ -6228,7 +6242,9 @@ @section Informative
@item mtn list changed
@itemx mtn list changed @var{pathname...}
address@hidden mtn ls
address@hidden mtn ls changed
address@hidden changed} is an alias for @command{list changed}.
+
This command lists all files in your workspace that have changed
compared to the base revision, including files that are dropped, added
or renamed.
@@ -6244,11 +6260,15 @@ @section Informative
@anchor{mtn list address@hidden mtn list databases
@itemx mtn list dbs
address@hidden mtn ls databases
address@hidden mtn ls dbs
+
Show all @ref{Managed Databases} and the workspaces registered in
them. See @ref{mtn register_workspace}.
@item mtn list duplicates address@hidden
address@hidden mtn ls
address@hidden mtn ls duplicates
address@hidden duplicates} is an alias for @command{list duplicates}.
This command lists duplicate files in a given revision. If no revision is
given, the workspace is used instead. Ignored and unknown files are
@@ -6259,7 +6279,9 @@ @section Informative
@item mtn list ignored
@itemx mtn list ignored @var{pathname...}
address@hidden mtn ls
address@hidden mtn ls ignored
address@hidden ignored} is an alias for @command{list ignored}.
+
This command lists all files in your workspace that monotone is
intentionally ignoring, due to the results of the @code{ignore_file
(@var{filename})} hook.
@@ -6275,7 +6297,9 @@ @section Informative
@item mtn list keys
@itemx mtn list keys @var{pattern}
address@hidden mtn ls
address@hidden mtn ls keys
address@hidden keys} is an alias for @command{list keys}.
+
These commands list @sc{rsa} keys held in your keystore and current database.
They do not print out any cryptographic information; they simply list the
names of public and private keys you have on hand.
@@ -6285,7 +6309,9 @@ @section Informative
@item mtn list known
@itemx mtn list known @var{pathname...}
address@hidden mtn ls
address@hidden mtn ls known
address@hidden known} is an alias for @command{list known}.
+
This command lists all files which would become part of the manifest of
the next revision if you committed your workspace at this point.
@@ -6300,7 +6326,9 @@ @section Informative
@item mtn list missing
@itemx mtn list missing @var{pathname...}
address@hidden mtn ls
address@hidden mtn ls missing
address@hidden missing} is an alias for @command{list missing}.
+
This command lists all files in your workspace's base manifest,
which are not present in the workspace.
@@ -6315,12 +6343,16 @@ @section Informative
@item mtn list vars
@itemx mtn list vars @var{domain}
address@hidden mtn ls
address@hidden mtn ls vars
address@hidden vars} is an alias for @command{list vars}.
+
This command lists all vars in your database, or all vars within a given
@var{domain}. See @ref{Vars} for more information.
@item mtn list tags address@hidden address@hidden
address@hidden mtn ls
address@hidden mtn ls tags
address@hidden tags} is an alias for @command{list tags}.
+
This command lists all known tags in your database. If @var{pattern}
is provided, it is used as a glob to select the tags listed, otherwise
all tags are listed. If @option{-exclude} options are provided they
@@ -6328,7 +6360,9 @@ @section Informative
@item mtn list unknown
@itemx mtn list unknown @var{pathname...}
address@hidden mtn ls
address@hidden mtn ls unknown
address@hidden unknown} is an alias for @command{list unknown}.
+
This command lists all files in your workspace that monotone is
either ignoring or knows nothing about.
@@ -9462,6 +9496,7 @@ @section Automation
@end table
address@hidden automate lua}
@item mtn automate lua @var{function_name} address@hidden
@table @strong
@@ -11251,8 +11286,7 @@ @section @code{basic_io} Format
parent.
Another example is the @file{read-permissions} file that's read by the
-default definition of the @code{get_netsync_read_permitted} Lua hook;
-see @ref{Default hooks}.
+default definition of the @ref{get_netsync_read_permitted} Lua hook.
Monotone will format its output in @code{basic_io} as follows:
@itemize
@@ -11901,7 +11935,7 @@ @subsection Netsync Transport Hooks
a TCP socket.
@ftable @code
address@hidden get_netsync_connect_command (@var{uri}, @var{args})
address@hidden@item get_netsync_connect_command (@var{uri}, @var{args})
Returns a table describing a command to run to connect to the
specified host. The @var{uri} argument is a table containing
@@ -12458,7 +12492,8 @@ @subsection Meta Hooks
@subsection Meta Hooks
Monotone allows the execution of arbitrary Lua hooks and functions through a
-special generalized "meta hook". See @command{automate lua} for more information.
+special generalized "meta hook". See @ref{mtn automate lua} for more
+information.
@ftable @code
@item hook_wrapper (@var{func_name}, @var{...})
============================================================
--- po/sv.po 66e25c913d0ac84d429945643c9d2353881670f7
+++ po/sv.po a65ff2d3e93bbd1860a57ca7f85826ca17c1e3fd
@@ -154,8 +154,8 @@ msgstr ""
msgstr ""
"Project-Id-Version: monotone 0.26pre1\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-01-09 22:49+0100\n"
-"PO-Revision-Date: 2011-01-09 22:51+0100\n"
+"POT-Creation-Date: 2011-01-10 04:37+0100\n"
+"PO-Revision-Date: 2011-01-10 04:37+0100\n"
"Last-Translator: Joel Rosdahl <address@hidden>\n"
"Language-Team: Richard Levitte <address@hidden>\n"
"Language: \n"
@@ -2506,9 +2506,9 @@ msgstr "inga ändringar"
msgid "no changes"
msgstr "inga ändringar"
-#: cmd_diff_log.cc:424 cmd_ws_commit.cc:538 cmd_ws_commit.cc:547
-#: cmd_ws_commit.cc:776 cmd_ws_commit.cc:818 cmd_ws_commit.cc:890
-#: cmd_ws_commit.cc:1808 automate.cc:1019
+#: cmd_diff_log.cc:424 cmd_ws_commit.cc:538 cmd_ws_commit.cc:776
+#: cmd_ws_commit.cc:818 cmd_ws_commit.cc:890 cmd_ws_commit.cc:1808
+#: automate.cc:1019
msgid "[PATH]..."
msgstr "[SÃKVÃG]..."
@@ -2732,6 +2732,10 @@ msgstr "Använda \".\" om hela arbetskop
"In order to revert the entire workspace, specify \".\" as the file name."
msgstr "Använda \".\" om hela arbetskopian ska återställas."
+#: cmd_ws_commit.cc:547
+msgid "PATH..."
+msgstr "SÃKVÃG..."
+
#: cmd_ws_commit.cc:548
msgid "Reverses a mistaken 'drop'"
msgstr "Ã
terställer en borttagning ('drop') som gjordes av misstag"
@@ -4657,7 +4661,7 @@ msgstr "kunde inte fråga efter database
msgstr "kunde inte fråga efter databasens standardalias"
#: database.cc:5016
-#, fuzzy, c-format
+#, c-format
msgid "using default database '%s'"
msgstr "använder standarddatabasen '%s'"
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] net.venge.monotone.mingw-instructions: 746e9a2796d3eee1a77ecaf7b4461d6f999d7ddf,
code <=