[Monotone-commits-diffs] net.venge.monotone: 3b2a2ec027f659b2a11f02f794a8edd4884c4be5

[code]

revision:            3b2a2ec027f659b2a11f02f794a8edd4884c4be5
date:                2012-06-03T15:45:12
author:              address@hidden
branch:              net.venge.monotone
changelog:
* doc/monotone.texi: clean up conflict discussions. Fix an anchor. Mention 
rename branch in rename command.

manifest:
format_version "1"

new_manifest [b6354e31fcb7d0e2258bbc7f23780d9ca97f6548]

old_revision [53e02eaa302bc05e96a18e3882b0e9843b53cf9a]

patch "doc/monotone.texi"
 from [d1293584f8a36c591fec36bc00427f77512c9876]
   to [4e2c045249cb9db0d6b2b9fcfa311993ee659259]
============================================================
--- doc/monotone.texi	d1293584f8a36c591fec36bc00427f77512c9876
+++ doc/monotone.texi	4e2c045249cb9db0d6b2b9fcfa311993ee659259
@@ -31,7 +31,7 @@
 This manual is for the ``monotone'' distributed version control system.
 This edition documents version @value{VERSION}.
 
-Copyright @copyright{} 2003, 2004, 2011 Graydon Hoare @*
+Copyright @copyright{} 2003, 2004, 2011, 2012 Graydon Hoare @*
 Copyright @copyright{} 2004, 2005, 2006 Nathaniel Smith @*
 Copyright @copyright{} 2005 - 2010 Derek Scherger @*
 Copyright @copyright{} 2005, 2006 Daniel Carosone @*
@@ -3251,7 +3251,8 @@ @section Merge Conflicts
 with new conflicts and resolutions, to merge the remaining heads.
 
 For the special case of file content conflicts, a merge command
-invoked without @option{--resolve-conflicts} will attempt to start an
+invoked without @option{--resolve-conflicts} will attempt to use an
+internal content merger; if that fails, it will attempt to start an
 external interactive merge tool; the user must then resolve the conflicts
 and terminate the merge tool, letting monotone continue with the
 merge. This process is repeated for each file content conflict. See
@@ -3277,7 +3278,7 @@ @subsection Conflict Types
 Monotone versions files, directories, and file attributes explicitly,
 and it tracks individual file and directory identity from birth to
 death so that name changes throughout the full life-cycle can be
-tracked exactly.  Partly because of these qualities, monotone notices
+tracked exactly. Partly because of these qualities, monotone notices
 several types of conflicts that other version control systems may not.
 
 The two most common conflicts are described first, then all other
@@ -3294,17 +3295,21 @@ @subheading File Content Conflict
 has a @code{mtn:manual_merge} attribute with value @code{true}. If
 not, it uses an internal merge algorithm to detect whether the changes
 are to the same lines of the file. If they are not, monotone will use
-the result of the internal merge as the new file version.
+the result of the internal merge as the new file version. Note that
+this may not always be what the user wants; if the same line is added
+at two different places in the file, it will be in the result twice.
 
address@hidden:manual_merge} is set @code{true} when a file is
address@hidden for all files for which the @code{binary_file} hook
-returns true; see @ref{attr_init_functions}.
address@hidden:manual_merge} is automatically set @code{true} when a file
+is @command{add}ed for which the @code{binary_file} hook returns true;
+see @ref{attr_init_functions}. The user may also set the
address@hidden:manual_merge} attribute manually; see @address@hidden attr}}.
 
 If @code{mtn:manual_merge} is present and @code{true}, or if the
 changes are to the same lines of the file, and neither
 @option{--resolve-conflicts} nor @option{--non-interactive} was
 specified, the @ref{merge3} hook is called, with the content of both
-conflicting versions and their common ancestor.
+conflicting versions and their common ancestor. When the hook returns,
+the merge proceeds to the next conflict.
 
 Alternatively, you can use your favorite merge tool asychronously with
 the merge, and specify the result file in the conflicts file, using
@@ -3485,7 +3490,7 @@ @subheading Missing Root Conflict
 See the @command{pivot_root} command for more information on moving
 another directory to the project root.
 
address@hidden does not yet support resolving this conflict.
address@hidden does not support resolving this conflict.
 
 @subheading Invalid Name Conflict
 
@@ -5125,11 +5130,11 @@ @subheading Commands
 @item mtn conflicts show_remaining address@hidden
 Show remaining unresolved conflicts in the conflicts file.
 
address@hidden mtn conflicts resolve_first address@hidden @var{resolution}
address@hidden conflicts address@hidden mtn conflicts resolve_first address@hidden @var{resolution}
 Specify a resolution for the first conflict in the conflicts file; it
 must be a single file conflict. The conflicts file is updated.
 
address@hidden conflicts address@hidden mtn conflicts resolve_first_left address@hidden @var{resolution}
address@hidden mtn conflicts resolve_first_left address@hidden @var{resolution}
 @itemx mtn conflicts resolve_first_right address@hidden @var{resolution}
 Specify a resolution for one of the files in the first conflict in the
 conflicts file; it must be a two file conflict. The conflicts file is
@@ -5538,6 +5543,10 @@ @section Workspace
 This command also moves any attributes on @var{src} to @var{dst}; see
 @ref{File Attributes} for more details.
 
+Note that you cannot rename a branch. You can accomplish something
+similar by creating a new branch with the desired name, using the
address@hidden approve} command to add a branch name to the desired revision.
+
 @anchor{mtn address@hidden mtn revert @var{pathname...}
 @itemx mtn revert --missing @var{pathname...}
 See the online help for more options.
@@ -6336,7 +6345,7 @@ @section Review
 @section Review
 
 @ftable @command
address@hidden mtn approve @var{rev} address@hidden [--[no-]update]
address@hidden address@hidden mtn approve @var{rev} address@hidden [--[no-]update]
 This command puts @var{rev} on the branch @var{branchname} (defaults
 to the workspace branch).