hash [...] line instead of separate
+public_hash [...] and private_hash [...] lines.
+
name "address@hidden"
- public_hash [475055ec71ad48f5dfaf875b0fea597b5cbbee64]
- private_hash [7f76dae3f91bb48f80f1871856d9d519770b7f8a]
+ hash [475055ec71ad48f5dfaf875b0fea597b5cbbee64]
public_location "database" "keystore"
private_location "keystore"
@@ -1899,27 +1903,31 @@ None.
hash [...] line instead of separate
+public_hash [...] and private_hash [...] lines.
+
name "address@hidden"
- public_hash [475055ec71ad48f5dfaf875b0fea597b5cbbee64]
- private_hash [7f76dae3f91bb48f80f1871856d9d519770b7f8a]
+ hash [475055ec71ad48f5dfaf875b0fea597b5cbbee64]
public_location "database" "keystore"
private_location "keystore"
name "address@hidden"
- public_hash [3ac4afcd86af28413b0a23b7d22b9401e15027fc]
+ hash [3ac4afcd86af28413b0a23b7d22b9401e15027fc]
public_location "database"
name "address@hidden"
- public_hash [115fdc73d87a5e9901d018462b21a1f53eca33a1]
- private_hash [b520d2cfe7d30e4ea1725fc4f34646fc5469b13d]
+ hash [115fdc73d87a5e9901d018462b21a1f53eca33a1]
public_location "keystore"
private_location "keystore"
============================================================
--- docs/Default-hooks.html 376b6bebda4b4f90653b492a2a745cad621532f8
+++ docs/Default-hooks.html 1e00f393c542c972da1ad8726bfff0c2f4d9119a
@@ -481,9 +481,10 @@ mergers.meld = {
mergers.meld = {
cmd = function (tbl)
- io.write (string.format("\nWARNING: 'meld' was choosen to perform external 3-way merge.\n"..
- "You should merge all changes to *CENTER* file due to limitation of program\n"..
- "arguments.\n\n"))
+ io.write (string.format("\nWARNING: 'meld' was chosen to perform "..
+ "an external 3-way merge.\n"..
+ "You must merge all changes to the "..
+ "*CENTER* file."))
local path = "meld"
local ret = execute(path, tbl.lfile, tbl.afile, tbl.rfile)
if (ret ~= 0) then
@@ -529,9 +530,10 @@ mergers.vim = {
return execute_redirected("", string.gsub(out, "\\", "/"), "", unpack(diff3_args))
end
- io.write (string.format("\nWARNING: 'vim' was choosen to perform external 3-way merge.\n"..
- "You should merge all changes to *LEFT* file due to limitation of program\n"..
- "arguments.\n\n"))
+ io.write (string.format("\nWARNING: 'vim' was chosen to perform "..
+ "an external 3-way merge.\n"..
+ "You must merge all changes to the "..
+ "*LEFT* file.\n"))
local vim
if os.getenv ("DISPLAY") ~= nil and program_exists_in_path ("gvim") then
============================================================
--- docs/Selectors.html a538d71adb56579f2015ec217c2220bc061b548e
+++ docs/Selectors.html d57f09d765f0c7e5259cd4d9b7d7d656f6e4f733
@@ -132,6 +132,9 @@ Values to match for can have shell wildc
t. For example, t:monotone-0.11 matches
tag certs where the cert value begins with monotone-0.11.
Values to match for can have shell wildcards.
+w. This selector must be used from within a
+workspace and must not have any associated value. It matches the base
+revision ID(s) this workspace is based on.
Further selector types may be added in the future. ============================================================ --- monotone.html 41b7db4c537c9f1f00565281d52da936d673bd65 +++ monotone.html 71ae3cf897dbf1b8ad54d7538a1edd3b69f0effb @@ -44,7 +44,7 @@ version control tools.
Complete table of contents
t. For example, t:monotone-0.11 matches
tag certs where the cert value begins with monotone-0.11.
Values to match for can have shell wildcards.
+w. This selector must be used from within a
+workspace and must not have any associated value. It matches the base
+revision ID(s) this workspace is based on.
Further selector types may be added in the future. @@ -2293,7 +2296,7 @@ file, and given to the merge command via the --resolve-conflicts-file=filename or ---resolve-conflicts option; see See Conflicts. +--resolve-conflicts option; see Siehe Conflicts.
The merge command normally will perform as many merges as necessary to merge all current heads of a branch. However, when @@ -2832,7 +2835,7 @@ any file with a name matching one of the
The conflicts file format is as output by the automate -show_conflicts command; see See Automation. +show_conflicts command; see Siehe Automation.
Content conflicts that can be resolved by the internal line merger
have resolutions, so they will not show up in subsequent
@@ -4413,7 +4416,7 @@ adjust the expression used with the Lua
regular expression is correct for many programming languages. You can
adjust the expression used with the Lua hook
get_encloser_pattern; Hooks. For the regular expression
-syntax, See Regexps.
+syntax, Siehe Regexps.
--unified requests the “unified diff” format, the default.
--context requests the “context diff” format (analogous to
@@ -6247,8 +6250,13 @@ the passphrase that will be used to encr
name is the name to associate with the new key, and passphrase is
the passphrase that will be used to encrypt the private half.
-
hash [...] line instead of separate
+public_hash [...] and private_hash [...] lines.
+
name "address@hidden"
- public_hash [475055ec71ad48f5dfaf875b0fea597b5cbbee64]
- private_hash [7f76dae3f91bb48f80f1871856d9d519770b7f8a]
+ hash [475055ec71ad48f5dfaf875b0fea597b5cbbee64]
public_location "database" "keystore"
private_location "keystore"
@@ -6894,27 +6901,31 @@ None.
hash [...] line instead of separate
+public_hash [...] and private_hash [...] lines.
+
name "address@hidden"
- public_hash [475055ec71ad48f5dfaf875b0fea597b5cbbee64]
- private_hash [7f76dae3f91bb48f80f1871856d9d519770b7f8a]
+ hash [475055ec71ad48f5dfaf875b0fea597b5cbbee64]
public_location "database" "keystore"
private_location "keystore"
name "address@hidden"
- public_hash [3ac4afcd86af28413b0a23b7d22b9401e15027fc]
+ hash [3ac4afcd86af28413b0a23b7d22b9401e15027fc]
public_location "database"
name "address@hidden"
- public_hash [115fdc73d87a5e9901d018462b21a1f53eca33a1]
- private_hash [b520d2cfe7d30e4ea1725fc4f34646fc5469b13d]
+ hash [115fdc73d87a5e9901d018462b21a1f53eca33a1]
public_location "keystore"
private_location "keystore"
@@ -7612,7 +7623,7 @@ line merger, resolved_internal
- See Conflicts, for more information on conflict resolutions.
+
Siehe Conflicts, for more information on conflict resolutions.
- Output format:
-
First the revision ids of the left and right revisions, and their
@@ -8582,7 +8593,7 @@ hook; and if you send it to the monotone
regular expressions that match their particular syntax. If you have a
better regular expression for some language, you can add it to this
hook; and if you send it to the monotone developers, we will likely
-make it the default for that language. See Regexps, for the
+make it the default for that language. Siehe Regexps, for the
regular expression syntax.
external_diff (file_path, old_data, new_data, is_binary, diff_args, old_rev, new_rev)-
@@ -8921,7 +8932,7 @@ Returns true if a match for regexp<
regex.search(regexp, string)register_command(name, params, abstract, description, function)This section contains the entire source code of the standard hook file, that is built in to the monotone executable, and read before any user @@ -13279,9 +13290,10 @@ mergers.meld = { mergers.meld = { cmd = function (tbl) - io.write (string.format("\nWARNING: 'meld' was choosen to perform external 3-way merge.\n".. - "You should merge all changes to *CENTER* file due to limitation of program\n".. - "arguments.\n\n")) + io.write (string.format("\nWARNING: 'meld' was chosen to perform ".. + "an external 3-way merge.\n".. + "You must merge all changes to the ".. + "*CENTER* file.")) local path = "meld" local ret = execute(path, tbl.lfile, tbl.afile, tbl.rfile) if (ret ~= 0) then @@ -13327,9 +13339,10 @@ mergers.vim = { return execute_redirected("", string.gsub(out, "\\", "/"), "", unpack(diff3_args)) end - io.write (string.format("\nWARNING: 'vim' was choosen to perform external 3-way merge.\n".. - "You should merge all changes to *LEFT* file due to limitation of program\n".. - "arguments.\n\n")) + io.write (string.format("\nWARNING: 'vim' was chosen to perform ".. + "an external 3-way merge.\n".. + "You must merge all changes to the ".. + "*LEFT* file.\n")) local vim if os.getenv ("DISPLAY") ~= nil and program_exists_in_path ("gvim") then @@ -14488,7 +14501,7 @@ end
wait(pid): Additional Lua Functions[1] We +
[1] We say sha1 values are “unique” here, when in fact there is a small probability of two different versions having the same sha1 value. This probability is very small, so we discount it.
============================================================ # monotone.pdf is binary