On Wed, Oct 26, 2022 at 5:26 PM Grant Edwards <[email protected]> wrote: > > On 2022-10-26, Dale <[email protected]> wrote: > > Rich Freeman wrote: > >> If you use an x11-based merge tool then it will also refuse to attempt > >> an automatic > >> merge if X11 isn't available. (Obviously you can't actually run the > >> manual merge if the tool uses X11 and that isn't available.) > >> > >> > > > > I'd like to try a GUI based tool. Is that what you talking about? If > > so, name or what package has it? > > At one point, I had one of my systems configured to use "meld" when I > picked "interactive merge" in the etc-update menu, but I've since gone > back to just picking "show differences" in the etc-update menu, then > manually running merge on the two filenames shown. With the > interactive merge option, I was always a bit confused about which file > was the destination and what happened after I exited meld. >
I use cfg-update+meld. It can use any 3-way diff/edit tool, but there aren't many of those. I believe the three panels show: Left: the current config file Right: new new packaged config file Center: what the packaged config file was the last time you did an update So Left vs Center shows you what changes you've made vs upstream, and center vs right show you what changes upstream made to their file. So you would look for differences on the right side to see what needs attention in the file, and then work those changes if appropriate into the left file. You just edit the left file to get it the way you want it and save that, and then cfg-update captures the changes in RCS. -- Rich
