1 |
On Wed, Oct 26, 2022 at 5:26 PM Grant Edwards <grant.b.edwards@×××××.com> wrote: |
2 |
> |
3 |
> On 2022-10-26, Dale <rdalek1967@×××××.com> wrote: |
4 |
> > Rich Freeman wrote: |
5 |
> >> If you use an x11-based merge tool then it will also refuse to attempt |
6 |
> >> an automatic |
7 |
> >> merge if X11 isn't available. (Obviously you can't actually run the |
8 |
> >> manual merge if the tool uses X11 and that isn't available.) |
9 |
> >> |
10 |
> >> |
11 |
> > |
12 |
> > I'd like to try a GUI based tool. Is that what you talking about? If |
13 |
> > so, name or what package has it? |
14 |
> |
15 |
> At one point, I had one of my systems configured to use "meld" when I |
16 |
> picked "interactive merge" in the etc-update menu, but I've since gone |
17 |
> back to just picking "show differences" in the etc-update menu, then |
18 |
> manually running merge on the two filenames shown. With the |
19 |
> interactive merge option, I was always a bit confused about which file |
20 |
> was the destination and what happened after I exited meld. |
21 |
> |
22 |
|
23 |
I use cfg-update+meld. It can use any 3-way diff/edit tool, but there |
24 |
aren't many of those. |
25 |
|
26 |
I believe the three panels show: |
27 |
Left: the current config file |
28 |
Right: new new packaged config file |
29 |
Center: what the packaged config file was the last time you did an update |
30 |
|
31 |
So Left vs Center shows you what changes you've made vs upstream, and |
32 |
center vs right show you what changes upstream made to their file. So |
33 |
you would look for differences on the right side to see what needs |
34 |
attention in the file, and then work those changes if appropriate into |
35 |
the left file. |
36 |
|
37 |
You just edit the left file to get it the way you want it and save |
38 |
that, and then cfg-update captures the changes in RCS. |
39 |
|
40 |
-- |
41 |
Rich |