[SM-Discuss] confmeld options suggestions
lynx at mages.ath.cx
Fri Mar 31 06:43:11 EST 2006
I'd like to see everything we have now and another merging option.
I'd like the diffs of vanilla old config files and user changed old config
files to be available for application over the new config file. The idea is,
that if a config file changes incompatibly, you can't just use your old
config, but re-setting the new one can be tedious. That patch would give a
third, middle solution.
I guess this can be discarded if you plan to make a really intricate merging
Will confmeld be separated from the cast process?
On Friday 31 March 2006 07:14, David Brown wrote:
> A little back ground of how stage root with config files are going to
> work. With stage root enabled the install of the spell is actually
> going to a staged directory (going to be
> $BUILD_DIRECTORY/stage-$SPELL-$VERSION). So sorcery is then going to
> install the spell to the real system and stage the config files that
> already exist in the system to a config stage root (yeah double
> stageing but it's nessisary for config files).
> So what I'd like is some suggestions as to some options for a new
> script file that is going to meld the staged config files into the
> Some of the things I have been thinking of maybe similar options to
> resolving conflicts that p4 uses, -d for diff, -t for trample. Not
> sure about the other options like -a -s -m cause that involves
> breaking up a diff to parts then trying to apply the sub parts.
> But any other suggestions would be helpful.
> - David Brown
> SM-Discuss mailing list
> SM-Discuss at lists.ibiblio.org
We cannot command nature except by obeying her. --Sir Francis Bacon
More information about the SM-Discuss