# # # patch "monotone.html" # from [0a763ef488cdd54bfffdbbd7b21cad34bc475edb] # to [cf07fbe8469163a0dd10c04a990e5c96ef2ae55c] # # patch "monotone.pdf" # from [ed9d5bb14232d90512b00b9fcd5f7c681a50c776] # to [d1bfb1f9ac4249cdabd6348624b37638e9e28987] # ============================================================ --- monotone.html 0a763ef488cdd54bfffdbbd7b21cad34bc475edb +++ monotone.html cf07fbe8469163a0dd10c04a990e5c96ef2ae55c @@ -44,7 +44,7 @@ version control tools.

Complete table of contents

-

Inhaltsverzeichnis

+

Table of Contents

-
  • Anhang A Default hooks +
  • Appendix A Default hooks
  • General Index
  • @@ -2267,7 +2267,7 @@ file, and given to the merge command via the --resolve-conflicts-file=filename or ---resolve-conflicts option; see Siehe Conflicts. +--resolve-conflicts option; see See Conflicts.

    The merge command normally will perform as many merges as necessary to merge all current heads of a branch. However, when @@ -2794,7 +2794,7 @@ any file with a name matching one of the

    .mtn-ignore
    Contains a list of regular expression patterns, one per line. If it exists, any file with a name matching one of these patterns is -ignored. Siehe Regexps, for the syntax of these regular expressions. +ignored. See Regexps, for the syntax of these regular expressions.
    _MTN/wanted-testresults
    Contains a list of testresult key names, one per line. If it exists, update will only select revisions that do not have regressions according to the given testresult keys. @@ -3670,7 +3670,7 @@ two heads that the merge command would merge are used.

    The conflicts file format is as output by the automate -show_conflicts command; see Siehe Automation. +show_conflicts command; see See Automation.

    Content conflicts that can be resolved by the internal line merger have resolutions, so they will not show up in subsequent @@ -4264,7 +4264,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, Siehe Regexps. +syntax, See Regexps.

    --unified requests the “unified diff” format, the default. --context requests the “context diff” format (analogous to @@ -7431,7 +7431,7 @@ line merger, resolved_internal -

    Siehe Conflicts, for more information on conflict resolutions. +

    See Conflicts, for more information on conflict resolutions.

    Output format:
    First the revision ids of the left and right revisions, and their @@ -8291,7 +8291,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. Siehe Regexps, for the +make it the default for that language. See Regexps, for the regular expression syntax.
    external_diff (file_path, old_data, new_data, is_binary, diff_args, old_rev, new_rev)
    @@ -8619,7 +8619,7 @@ Returns true if a match for regexp<
    regex.search(regexp, string)
    Returns true if a match for regexp is found in str, return -false otherwise. Siehe Regexps, for the syntax of regexp. +false otherwise. See Regexps, for the syntax of regexp.
    register_command(name, params, abstract, description, function)
    Add a command named name to the user command group in monotone. This function is @@ -12527,7 +12527,7 @@ outside of any alternation, it acts exac

    -

    Anhang A Default hooks

    +

    Appendix A Default hooks

    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 @@ -14136,7 +14136,7 @@ end

  • wait(pid): Additional Lua Functions

  • -

    Fußnoten

    [1] We +

    Footnotes

    [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