14.0-RELEASE Upgrade question: Merge conflict markers remain

Thanks to SirDice and T-Aoki, I had already used vim but didn't remember.
My file after the edits now looks like:

Code: 
wheel:*:0:root,user
daemon:*:1:
kmem:*:2:
sys:*:3:
tty:*:4:
operator:*:5:root,user
mail:*:6:
bin:*:7:
news:*:8:
man:*:9:
games:*:13:
ftp:*:14:
staff:*:20:
sshd:*:22:
smmsp:*:25:
mailnull:*:26:
guest:*:31:
video:*:44:user,lightdm
realtime:*:47:
idletime:*:48:
bind:*:53:
unbound:*:59:
proxy:*:62:
authpf:*:63:
_pflogd:*:64:
_dhcp:*:65:
uucp:*:66:
dialer:*:68:
network:*:69:
audit:*:77:
www:*:80:
u2f:*:116:
ntpd:*:123:
_ypldap:*:160:
hast:*:845:
tests:*:977:
nogroup:*:65533:
nobody:*:65534:
user:*:1001:
_tss:*:601:
messagebus:*:556:
avahi:*:558:
polkitd:*:565:
cups:*:193:
colord:*:970:
pulse:*:563:
pulse-access:*:564:
pulse-rt:*:557:
git_daemon:*:964:
lightdm:*:164:
vboxusers:*:920:user,root
test:*:1002:
_sndio:*:702:
cyrus:*:60:
After saving it:
Code: 
/var/db/freebsd-update/merge/new//etc/group: 54 lines, 745 characters.

After that had to edit '/etc/password' the same way to preserve the previous login key and discard the useless and duplicate lines.
Why isn't this done automatically? More or less everybody just wants to keep the same settings as they were and merge the new changes for the better, I don't see it that difficult to implement...
 
bugzeo said:
Why isn't this done automatically? More or less everybody just wants to keep the same settings as they were and merge the new changes for the better, I don't see it that difficult to implement...
Click to expand...

I guess an option before editing the merge conflicts would be great.
i.e. Do you want to use (o)ld, (u)pdated or (m)erge?
 
freezr said:
[…] the most convoluted editor. ?
Click to expand...
grahamperrin said:
⚙ D36786 freebsd-update.sh: EDITOR: if not set, prefer ee […]
Click to expand...
In defense of vi(1): ex and vi are POSIX-standard utilities. And so is ed. ? A POSIX-compliant system may optionally provide ex and vi, but ed is mandatory. I think some proficiency in POSIX utilities is absolutely essential. ?‍♂️

The command help box at the top of ee(1) uses the conventional ^w notation. A Windoos user (Unicode emoticon: ?) may not understand this as (briefly) press W whirr pressing and holding (at least one) control key, so then again you need to consult the man page (where this notation is explained). But do we need to cater to such users’ needs?​
 
SirDice said:
… adjust ~/.cshrc (if you're on csh(1)) and/or add export EDITOR=ee to ~/.shrc if you're on sh(1).
Click to expand...

Any reason to not (instead) edit these two files?
  • /root/.cshrc
  • /etc/profile

If EDITOR is /usr/bin/ee for a privileged user but not for the root user, then (for example) there's a likelihood of /usr/bin/vi in response to sudo freebsd-update upgrade -r 14.0-RELEASE:

1703335510743.png
 
SirDice said:
/root/.cshrc is root's ~/.cshrc
Click to expand...

Oops! Thanks. I didn't join the dots.

I guess, I'd edit /root/.shrc (instead of the system login profile) only if it's a multi-user machine with other people specifically wanting vi as the default.


Plus, I just realised, /etc/csh.cshrc as the system-wide .cshrc file for csh(1).

tcsh(1) FILES
 
Last edited:
SirDice said:
You need to remove those markers too. Don't just edit it, actually fix the file so it's how it's supposed to end up. Do NOT leave those markers in there.

This bit:
Code: 
<<<<<<< current version
# $FreeBSD$
#
wheel:*:0:root,epitaxial
=======
wheel:*:0:root
>>>>>>> 14.0-RELEASE
Needs to look like this:
Code: 
wheel:*:0:root,epitaxial

You probably want to keep the 'epitaxial' user in the 'wheel' group.
Click to expand...
You really ought to show before and after snippets. Maybe you thought you gave us a before and after example but I don't see it.
I do not understand your post.
 
You must log in or register to reply here.
Back
Top