Lines Matching +full:current +full:- +full:mode

1 .\" Copyright (c) 2010-2013 Hudson River Trading LLC
91 It manages updates by doing a three-way merge of changes made to these
96 To perform a three-way merge,
98 keeps copies of the current and previous versions of files that it manages.
100 .Dq current
107 .Dq current
127 The mode is specified via an optional command argument.
129 If a command is not specified, the default mode is used.
130 .Ss Default Mode
131 The default mode merges changes from the source tree to the destination
135 .Dq current
148 .Dq current
153 .Dq current
162 .Dq current
173 .Dq current
178 .Dq current
183 .Dq current
188 .Dq current
209 .Bl -tag -width "A" -compact -offset indent
228 will perform post-install actions any time that the file is updated.
276 .Ss Build Mode
279 mode is used to build a tarball that contains a snapshot of a
280 .Dq current
294 .Ss Diff Mode
297 mode compares the versions of files in the destination directory to the
298 .Dq current
307 .Ss Extract Mode
310 mode generates a new
311 .Dq current
313 Unlike the default mode,
315 .Dq current
320 .Dq current
322 .Ss Resolve Mode
325 mode is used to resolve any conflicts encountered during a merge.
326 In this mode,
332 .Bl -tag -width "(tf) theirs-full" -compact
335 .It (df) diff-full
341 .It (mf) mine-full
344 .Dq current
346 .It (tf) theirs-full
348 .Dq current
353 .Ss Revert Mode
356 mode is used to restore the stock versions of files.
357 In this mode,
360 This mode cannot be used to restore directories, only individual files.
361 .Ss Status Mode
364 mode shows a summary of the results of the most recent merge.
372 .Bl -tag -width ".Fl A Ar patterns"
381 Multiple space-separated patterns may also be specified in a single
412 .Dq current
421 .Dq current
427 mode,
437 .Dq current
441 .Dq current
444 .Dq current
449 .Dq current
469 Multiple space-separated patterns may also be specified in a single
486 .Dq current
492 variables for a cross-build.
499 .Dq current
503 .Dq dry-run
504 mode.
509 .Dq current
517 .Dq current
523 .Dq current
530 .Dq pre-world
531 mode.
538 .Dq current
545 .Dq current
551 .Dq pre-world
553 .Dq pre-world
557 .Dq current
562 .Dq re-run
566 .Dq current
572 .Dq current
588 .Bl -tag -width ".Ev ALWAYS_INSTALL"
604 This is enabled by setting the variable to a non-empty value.
618 .Dq current
626 .Dq current
651 .Bl -tag -width ".Pa /var/db/etcupdate/log" -compact
660 .Ex -std
698 command to compare the reference tree to your current files in
705 .Pa /var/db/etcupdate/current
719 .Dl "etcupdate extract -s /path/to/tree"
734 .Dq current
742 .Bl -diag
757 .Dq current
770 .Dq current
785 .Dq current
797 .Dq current
823 was updated during a merge with a non-empty destination directory.
835 .Dq current
844 .Dq current
851 .It "Non-empty directory remains: <file>"
855 .Dq current
869 .Dq current
876 .Dq current
887 .Dq current