Lines Matching +full:in +full:- +full:tree

1 .\" Copyright (c) 2010-2013 Hudson River Trading LLC
5 .\" Redistribution and use in source and binary forms, with or without
10 .\" 2. Redistributions in binary form must reproduce the above copyright
11 .\"    notice, this list of conditions and the following disclaimer in the
17 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
21 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
89 such as files in
91 It manages updates by doing a three-way merge of changes made to these
96 To perform a three-way merge,
99 These copies are stored in two trees known as the
115 If the local changes to a file conflict with the changes made to a file in
116 the source tree,
131 The default mode merges changes from the source tree to the destination
154 tree already exists,
155 then that tree is saved as the
157 tree.
160 tree is removed if it exists.
163 tree is built from a source tree.
168 then the tree is extracted from that tarball instead.
172 compares the files in the
179 tree,
184 tree,
187 If a file is changed in the
189 tree,
192 will attempt to merge the changes into the version of the file in the
198 then the merged version of the file will be saved in the destination
202 is not able to safely merge in changes to a file other than a merge conflict,
209 .Bl -tag -width "A" -compact -offset indent
228 will perform post-install actions any time that the file is updated.
273 In this case no warning is issued as the result of
281 tree.
285 to perform a merge without requiring a source tree that matches the
297 mode compares the versions of files in the destination directory to the
299 tree and generates a unified format diff of the changes.
303 does not manage files that are not maintained in the source tree such as
312 tree.
316 tree and does not modify any existing
318 tree.
321 tree can either be built from a source tree or extracted from a tarball.
326 In this mode,
332 .Bl -tag -width "(tf) theirs-full" -compact
335 .It (df) diff-full
338 Change the merged file in an editor.
341 .It (mf) mine-full
342 Use the version of the file in the destination directory and ignore any
343 changes made to the file in the
345 tree.
346 .It (tf) theirs-full
349 tree and discard any local changes made to the file.
357 In this mode,
372 .Bl -tag -width ".Fl A Ar patterns"
375 listed in
381 Multiple space-separated patterns may also be specified in a single
389 Do not build generated files in a private object tree.
391 reuse the generated files from a previously built object tree that matches
392 the source tree.
393 This can be useful to avoid gratuitous conflicts in
405 The default destination directory is an empty string which results in
419 Ignore changes in the FreeBSD ID string when comparing files in the
420 destination directory to files in either of the
425 In
428 this reduces noise due to FreeBSD ID string changes in the output.
433 if a file in the destination directory is identical to the same file in the
435 tree modulo the FreeBSD ID string,
440 if a file in the destination directory is identical to the same file in the
442 tree modulo the FreeBSD ID string,
453 will not change the file in the destination directory.
455 Due to limitations in the
458 this option may not have an effect if there are other changes in a file that
461 Ignore any files that match any of the patterns listed in
469 Multiple space-separated patterns may also be specified in a single
477 By default the log file is stored in a file named
479 in the work directory.
487 tree.
492 variables for a cross-build.
500 tree.
503 .Dq dry-run
518 tree will be extracted to perform the comparison.
524 tree.
525 The resulting tree will include a corresponding
530 .Dq pre-world
543 a temporary tree is populated with the necessary files.
544 This temporary tree is compared against the
546 tree.
551 .Dq pre-world
553 .Dq pre-world
562 .Dq re-run
565 Specify an alternate source tree to use when building or extracting a
567 tree.
568 The default source tree is
573 tree from a tarball previously generated by the
575 command rather than building the tree from a source tree.
580 utility can also be configured by setting variables in an optional
583 Note that command line options override settings in the configuration file.
588 .Bl -tag -width ".Ev ALWAYS_INSTALL"
590 Always install files that match any of the patterns listed in this variable
601 Ignore changes in the FreeBSD ID string similar to the
604 This is enabled by setting the variable to a non-empty value.
606 Ignore files that match any of the patterns listed in this variable
619 tree similar to the
627 tree similar to the
631 Specify an alternate source tree similar to the
642 utility uses the program identified in the
651 .Bl -tag -width ".Pa /var/db/etcupdate/log" -compact
660 .Ex -std
662 To compare the files in
681 command will fail with an error about a missing reference tree if
686 requires a source tree that matches the currently installed world.
689 before updating the source tree to start the next world upgrade cycle.
691 generate a reference tree:
698 command to compare the reference tree to your current files in
702 or by copying files from the reference tree
710 If the tree at
713 a new tree matching the currently installed world can be checked out to
715 The reference tree for
719 .Dl "etcupdate extract -s /path/to/tree"
725 the changes in the tree at
731 rarely if at all in practice.
733 if a file changes from a file to a directory in the
735 tree
736 and the file was modified in the destination directory,
738 In general,
740 the corresponding file in the destination directory is not changed by a
742 .Bl -diag
756 in the
758 tree.
763 in the destination directory.
769 was modified in the
771 tree,
774 in the destination directory.
780 in the
782 tree to type
784 in the
786 tree.
787 The file in the destination directory of type
798 tree,
800 The modified version of the file remains in the destination directory.
809 from its source file in
823 was updated during a merge with a non-empty destination directory.
836 tree.
837 A file of that name already exists in the destination directory,
845 tree that links to
847 A symbolic link of the same name already exists in the destination
851 .It "Non-empty directory remains: <file>"
856 tree,
857 but it contains additional files in the destination directory.
864 in the
866 tree to type
868 in the
870 tree,
871 but it has been removed in the destination directory.
875 was modified in the
877 tree,
878 but it has been removed in the destination directory.
886 in the
888 tree,
889 but it has been removed in the destination directory.
903 utility first appeared in
921 to resolve a specific conflict in an automated fashion.
925 often results in gratuitous diffs in
927 that cause conflicts in the first merge.
928 If an object tree that matches the source tree is present when bootstrapping,