Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?

2009-05-30 Thread Doug Barton
Torfinn Ingolfsen wrote: > On Sat, 16 May 2009 16:13:12 -0700 > Doug Barton wrote: > >> You should be able to grab the file from HEAD and run it on >> RELENG_[67] without any problems. I will MFC it as rapidly as >> possible. > > FWIW, today I upgraded a machine from 7.1-stable (dated 2009-01-11

Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?

2009-05-29 Thread Torfinn Ingolfsen
On Sat, 16 May 2009 16:13:12 -0700 Doug Barton wrote: > You should be able to grab the file from HEAD and run it on > RELENG_[67] without any problems. I will MFC it as rapidly as > possible. FWIW, today I upgraded a machine from 7.1-stable (dated 2009-01-11) to 7.2-stable (csup'ed today). For t

Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?

2009-05-16 Thread Doug Barton
I think I now know what was causing the problem with the files being overwritten, the saved mtree database was somehow reduced to zero bytes causing the list of CHANGED files to be empty. Unfortunately I haven't tracked down the cause of why the mtree file would get emptied out (given that there i

Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?

2009-05-11 Thread Torfinn Ingolfsen
On Sun, 10 May 2009 21:49:23 -0700 Doug Barton wrote: > Torfinn Ingolfsen wrote: > > To be clear, I follow this procedure: > > 1. make buildworld > > 2. make kernel > > 3. shutdown now > > 4. mergemaster -p > > 5. make installworld > > 6. mergemaster -iU > > 7. fastboot > > By any chance is any

Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?

2009-05-10 Thread Doug Barton
Torfinn Ingolfsen wrote: > To be clear, I follow this procedure: > 1. make buildworld > 2. make kernel > 3. shutdown now > 4. mergemaster -p > 5. make installworld > 6. mergemaster -iU > 7. fastboot By any chance is any of this happening in a jail? Or by any chance is /etc a symlink? A user sent m

Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?

2009-05-07 Thread Daniel Gerzo
On Thu, 07 May 2009 09:40:52 +0200, "Matthias Andree" wrote: > Am 05.05.2009, 09:46 Uhr, schrieb Daniel Gerzo : > >> 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, an

Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?

2009-05-07 Thread Matthias Andree
Am 05.05.2009, 09:46 Uhr, schrieb Daniel Gerzo : 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

Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?

2009-05-06 Thread Torfinn Ingolfsen
On Tue, 05 May 2009 14:28:22 -0700 Doug Barton wrote: > I've read this thread and find the whole thing very odd. In particular I agree - it is odd. I have a few more machines to upgrade in the coming weeks - if anyone have a better testcase to find out what is going on, I'm ready for it. > Tha

Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?

2009-05-05 Thread Bruce Cran
On Tue, 05 May 2009 14:28:22 -0700 Doug Barton wrote: > Torfinn Ingolfsen wrote: > > Ok, this is strange. > > > > I just upgraded from 7.2-prerelease (as of 20090401) to 7.2-stable > > as of today, using csup and building world. > > I've read this thread and find the whole thing very odd. In pa

Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?

2009-05-05 Thread Doug Barton
Torfinn Ingolfsen wrote: > Ok, this is strange. > > I just upgraded from 7.2-prerelease (as of 20090401) to 7.2-stable as > of today, using csup and building world. I've read this thread and find the whole thing very odd. In particular regarding your case, the last change to mergemaster was done

Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?

2009-05-05 Thread Doug Barton
Cristiano Deana wrote: > On Mon, May 4, 2009 at 10:50 PM, Torfinn Ingolfsen > wrote: > >> I just upgraded from 7.2-prerelease (as of 20090401) to 7.2-stable as >> of today, using csup and building world. > > i upgraded fw machines from _7_1 to _7_2. no problem at all here. > did mergemaster is c

Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?

2009-05-05 Thread Cristiano Deana
On Mon, May 4, 2009 at 10:50 PM, Torfinn Ingolfsen wrote: > I just upgraded from 7.2-prerelease (as of 20090401) to 7.2-stable as > of today, using csup and building world. i upgraded fw machines from _7_1 to _7_2. no problem at all here. did mergemaster is changed from -RELEASE to -STABLE? hin

Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?

2009-05-05 Thread 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.

Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?

2009-05-05 Thread Daniel Gerzo
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 /

Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?

2009-05-04 Thread Torfinn Ingolfsen
On Mon, 04 May 2009 22:26:52 +0100 Vincent Hoffman wrote: > Not that its a cure but are master.passwd and group backups in > /var/backups any help to you in this case? Ah - great tip - thanks! (In case of the first server, the changes to group and passwd files were few, so I just re-did the chan

Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?

2009-05-04 Thread Vincent Hoffman
On 4/5/09 21:50, Torfinn Ingolfsen wrote: > Ok, this is strange. > > I just upgraded from 7.2-prerelease (as of 20090401) to 7.2-stable as > of today, using csup and building world. > > As part of that process I did (as I always do) 'mergemaster -iU' after > the 'make installworld' step. > A few fi

Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?

2009-05-04 Thread Manolis Kiagias
Torfinn Ingolfsen wrote: > Ok, this is strange. > > I just upgraded from 7.2-prerelease (as of 20090401) to 7.2-stable as > of today, using csup and building world. > > As part of that process I did (as I always do) 'mergemaster -iU' after > the 'make installworld' step. > A few files on my machine

RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?

2009-05-04 Thread Torfinn Ingolfsen
Ok, this is strange. I just upgraded from 7.2-prerelease (as of 20090401) to 7.2-stable as of today, using csup and building world. As part of that process I did (as I always do) 'mergemaster -iU' after the 'make installworld' step. A few files on my machines are modified by me, and thus should n