tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: configuration versioning: basic functionality needs testing

I'm not sure if it would be better to merge into the copy of the currently installed configuration file changes going from the first to the last revision of example configuration, or changes from the second to last to the last revision.

> On June 10, 2018 at 1:18 PM Keivan Motavalli <> wrote:
> [...]
> the initial revision of the provided example file is checked out from
> VCSDIR/defaults/path/to/installed/file.
> "merge file1 file2 file3" from "rcs" is run
> with file.automerge as the first file, file2 the initial revision of
> package-provided example configuration files, and file3 the last
> revision of package-provided example configuration files ($f_eg).
> does this make sense?
here part of the email got cut... if the merge exits with no errors or conflicts, the result is copied to $file
> $file, otherwise the user is asked to manually review changes and
> nothing gets done.
> [...]
> As already stated, I'm open to corrections, suggestions and ideas on
> how to go on with the project, since objectives have changed trying
> to align with pkgsrc needs (and I'd really like to have some
> functionality usable by the community before experimenting with
> configuration pulling, remote repositories, other VCSs and tools!)
> a diff against pkgsrc-2018Q1 is attached, changes are also viewable at
> and testable from
> Keivan

Home | Main Index | Thread Index | Old Index