Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 947044 - making dispatch-conf somewhat smarter (3-way merge)
Summary: making dispatch-conf somewhat smarter (3-way merge)
Status: UNCONFIRMED
Alias: None
Product: Portage Development
Classification: Unclassified
Component: Enhancement/Feature Requests (show other bugs)
Hardware: All Linux
: Normal minor
Assignee: Portage team
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2024-12-27 19:43 UTC by gentoo2020
Modified: 2024-12-28 14:14 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description gentoo2020 2024-12-27 19:43:36 UTC
# current situation

* install gentoo
* run `dispatch-conf` ; everything is fine
* edit some system config file ie. like /etc/ssh/sshd_config and change `#LogLevel INFO` to `LogLevel DEBUG` # or whatever.. just an example
* run `emaint sync`
* run `dispatch-conf`
* user is prompted to keep/discard/merge changes

# what is desired

above example may have been somewhat awkward, so I'll try to make it more explicit

## package-provided file is

```
LINE1 = foo
LINE2 = bar
LINE3 = baz
```

## user changes this to 
```
LINE1 = foo
LINE2 = BAR
LINE3 = baz
```

## then, package maintainer changes defaults to 
```
LINE1 = foo
LINE2 = bar
LINE3 = BAZ
```

## subsequently, dispatch-conf SHOULD suggest
```
LINE1 = foo
LINE2 = BAR
LINE3 = BAZ
```

instead of simply ignoring the changes the user has made (which are probably here for a reason)


Reproducible: Always

Steps to Reproduce:
see above
Actual Results:  
my changes are lost unless I spend too much time caring about it

Expected Results:  
my changes are kept, and the diffs with the ebuild maintainer are included in the config file

a three-way merge, keeping a reference to what the ebuild maintainer set as default values and comparing this against the new defaults and the actual config file