RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?

[Roland Smith]

On Tue, May 05, 2009 at 09:46:22AM +0200, Daniel Gerzo wrote:
> Manolis Kiagias wrote:
> 
> > I always use -iU too.
> > I've lost motd, passwd, group and master.passwd
> > During mergemaster -p I was asked to merge changes to some of these, and
> > still they were replaced with the newer versions. I don't know what went
> > wrong but have restored them from backup. (I always tar /etc before a
> > source upgrade). Upgrading another system using freebsd-update did not
> > cause any problem.
> 
> I have the same experience while I was upgrading a few machines 
> upgrading from RELENG_7 to RELENG_7_2. I haven't experienced when 
> upgrading from 7.1-R to 7.2-R.
> 
> Here auth.conf, csh.cshrc, hosts, crontab, syslogd.conf, passswd, 
> master.passwd, group, sysctl.conf motd and maybe some more got 
> overwritten :-( I had to restore from backups.

When upgrading from 7-STABLE to 7.2-RELEASE mergemaster -s -i -U
overwrote all the file I'd changed without asking. Luckily I keep all
config files that I've changed in a separate repository, so putting it
all back was a question of running an install script. But the change is
annoying.

Roland
-- 
R.F.Smith                                   http://www.xs4all.nl/~rsmith/
[plain text _non-HTML_ PGP/GnuPG encrypted/signed email much appreciated]
pgp: 1A2B 477F 9970 BA3C 2914  B7CE 1277 EFB0 C321 A725 (KeyID: C321A725)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-stable/attachments/20090505/11852549/attachment.pgp