, July 02, 2013 8:37 PM
To: freebsd-questions@freebsd.org
Subject: Re: Should I be able to use mergemaster with freebsd-update?
Hi all,
In case anybody was following this discussion, I have successfully upgraded
the system from 8.2 to 8.4 using freebsd-update. The process did have some
glitches (in
Subject: Re: Should I be able to use mergemaster with freebsd-update?
On Tue, Jun 25, 2013, at 15:29, Eugene wrote:
I do not quite understand. Is the freebsd-update upgrade process
completely broken?
IMHO it is partially broken; I'm not doing anything special. How broken it
is
depends on w
On Wed, Jun 26, 2013, at 2:07, Mike Brown wrote:
>
> Next step, I think, is reboot, before another 'freebsd-update install'
> run.
> I'm worried something is still amiss, though, so I'm holding off for now.
> :(
When in doubt: fetch source, build, instal
I wrote:
> The main problem this time is that I'm not so lucky with the password files,
> because for 8.4, freebsd-update has fetched new, stock .db files to put in
> /etc.
Whoa, sorry, I misspoke here.
freebsd-update asked me, after the merges, to approve unspecified differences
in pwd.db a
igned to do,
it indeed does very well. It also overlaps some of the functionality of
mergemaster in that it automatically merges as many files as it can, which is
nice.
Where it is under-designed and under-implemented is in its rudimentary
handling of un-mergeable files, and in its total lack of
tor for
merging many, many files. Maybe nearly everything in /etc. It's quite
time consuming, whereas I can get mergemaster to auto-merge all of those
files and only show me the 5 that I've personally touched.
___
freebsd-questions@freebsd.org mai
soon (especially as 8.2 is already not compatible with some ports).
Best wishes
Eugene
-Original Message-
From: Mike Brown
Sent: Tuesday, June 25, 2013 12:14 PM
To: freebsd-questions@freebsd.org
Subject: Re: Should I be able to use mergemaster with freebsd-update?
I'm using fr
of this atrocity.
If it requires we setup a stupid kickstarter to fund a developer to sit
down and rip into freebsd-update so it uses mergemaster I would be
incredibly thankful. I don't know how anyone can upgrade between FreeBSD
releases without an /etc/mergemaster.rc with the followin
> I'm using freebsd-update to upgrade my system to the latest minor version
> (from 8.3-RELEASE to 8.4-RELEASE).
>
> I'm surprised that the merge handling system isn't more robust. When
> upgrading
> the old way, from source, I was used to using mergemaster to h
I'm using freebsd-update to upgrade my system to the latest minor version
(from 8.3-RELEASE to 8.4-RELEASE).
I'm surprised that the merge handling system isn't more robust. When upgrading
the old way, from source, I was used to using mergemaster to handle any
merges that c
On 03/17/2013 02:52 PM, Tim Daneliuk wrote:
PR 177055 submitted.
--
Tim Daneliuk tun...@tundraware.com
PGP Key: http://www.tundraware.com/PGP/
___
freebsd-q
On 03/17/2013 02:36 PM, Tim Daneliuk wrote:
$ mergemaster -Fi
*** The directory specified for the temporary root environment,
/var/tmp/temproot, exists. This can be a security risk if untrusted
users have access to the system.
Use 'd' to delete the old /var/tmp/te
$ mergemaster -Fi
*** The directory specified for the temporary root environment,
/var/tmp/temproot, exists. This can be a security risk if untrusted
users have access to the system.
Use 'd' to delete the old /var/tmp/temproot and continue
Use 't' to select
On 5 February 2012 23:59, Net Warrior wrote:
> Hi there.
>
> I found very tedious when , after a makeworld the mergemaster process to
> say (i) to install/upgrade/replace/ with the new file, specially when
> there are a lot of files I was reading the documentation but it'
On Sun, 5 Feb 2012 17:40:14 -0700 (MST)
Warren Block wrote:
> On Sun, 5 Feb 2012, Net Warrior wrote:
>
> > Hi there.
> >
> > I found very tedious when , after a makeworld the mergemaster
> > process to say (i) to install/upgrade/replace/ with the new file,
> &g
On Sun, 5 Feb 2012, Net Warrior wrote:
Hi there.
I found very tedious when , after a makeworld the mergemaster process to say
(i) to install/upgrade/replace/ with the new file, specially when there are
a lot of files I was reading the documentation but it's not clear to me
which opti
Hi there.
I found very tedious when , after a makeworld the mergemaster process to
say (i) to install/upgrade/replace/ with the new file, specially when
there are a lot of files I was reading the documentation but it's not
clear to me which option to use to automate the process, whi
> From owner-freebsd-questi...@freebsd.org Fri Nov 4 19:55:44 2011
> From: Zantgo
> Date: Fri, 4 Nov 2011 21:55:03 -0300
> To: freebsd-questions@freebsd.org
> Cc:
> Subject: Problem with mergemaster-p
>
> I'm trying to upgrade to 9.0 stable, but when I run "m
On Fri, 4 Nov 2011 22:33:05 -0300
Zantgo wrote:
> Yeah!!. Thanks!, forgot to be in / usr / src.
(please don't insert spaces into pathnames; there's simply no earthly
reason for doing so, and besides that, an inadvertently place space in
certain commands can be disastrous, e.g., "rm -rf / some-di
On Fri, 4 Nov 2011 22:14:10 -0300
Zantgo wrote:
>
>
> El 04-11-2011, a las 21:55, Zantgo escribió:
>
> > I'm trying to upgrade to 9.0 stable, but when I run "mergemaster-p"
> > in single mode, I get the following error message:
> >
> > *
`make installkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC).
> [steps 3. & 4. can be combined by using the "kernel" target]
> 5. `reboot'(in single user mode: boot -s from the loader prompt).
> 6. `mergemaster -p'
> 7. `make installwor
be combined by using the "kernel" target]
5. `reboot'(in single user mode: boot -s from the loader prompt).
6. `mergemaster -p'
7. `make installworld'
8. `make delete-old'
9. `mergemaster'(you may wish to use -i, along with -U or -
El 04-11-2011, a las 21:55, Zantgo escribió:
> I'm trying to upgrade to 9.0 stable, but when I run "mergemaster-p" in single
> mode, I get the following error message:
>
> *** Creating the temporary root environment in / var / tmp / temproot
> mkdir / var /
On Fri, 4 Nov 2011 21:55:03 -0300, Zantgo wrote:
> I'm trying to upgrade to 9.0 stable, but when I run "mergemaster-p" in single
> mode, I get the following error message:
>
> *** Creating the temporary root environment in / var / tmp / temproot
> mkdir / var /
I'm trying to upgrade to 9.0 stable, but when I run "mergemaster-p" in single
mode, I get the following error message:
*** Creating the temporary root environment in / var / tmp / temproot
mkdir / var / tmp / temproot: Read-only file system
*** FATAL ERROR: Can not cre
On Thu, 7 Jul 2011, d...@safeport.com wrote:
I have a mergemaster question. I assume this is my error but do not see what
I did. I am testing remote update procedures so I started with a 7.0 IS0 and
updated it to 7.4.
My mergemaster.rc has the following directives:
FREEBSD_ID=yes
I have a mergemaster question. I assume this is my error but do not see what I
did. I am testing remote update procedures so I started with a 7.0 IS0 and
updated it to 7.4.
My mergemaster.rc has the following directives:
FREEBSD_ID=yes
AUTO_UPGRADE=yes
AUTO_INSTALL=yes
On 02/24/11 06:05, Matthew Seaman wrote:
[Snip mergemaster options discussion.]
Doing this certainly works for me -- frequently the only file I get
asked about is /etc/motd
And if you don't care about updating /etc/motd (the first line is
automagically updated every boot anyway
On 24/02/2011 07:05, Matthew Seaman wrote:
On 23/02/2011 22:14, Lowell Gilbert wrote:
David Demelier writes:
I also noticed that even with the -F flag, mergemaster still asks for
files that only differs by CVS id, see :
-# $FreeBSD: src/etc/sendmail/freebsd.mc,v 1.37.2.2.2.1
2010/06/14
On 23/02/2011 22:14, Lowell Gilbert wrote:
> David Demelier writes:
>
>> I also noticed that even with the -F flag, mergemaster still asks for
>> files that only differs by CVS id, see :
>>
>> -# $FreeBSD: src/etc/sendmail/freebsd.mc,v 1.37.2.2.2.1
>&g
David Demelier writes:
> I also noticed that even with the -F flag, mergemaster still asks for
> files that only differs by CVS id, see :
>
> -# $FreeBSD: src/etc/sendmail/freebsd.mc,v 1.37.2.2.2.1
> 2010/06/14 02:09:0 6 kensmith Exp $ #
> +# $FreeBSD: src/etc/s
On 18/02/2011 14:25, Lowell Gilbert wrote:
David Demelier writes:
Hello,
Each time I run mergemaster -UiF, it asks for a lot of file that I do
not have modified such as /dev/rc.d/* and /etc/defaults/*
==
Use '
David Demelier writes:
> Hello,
>
> Each time I run mergemaster -UiF, it asks for a lot of file that I do
> not have modified such as /dev/rc.d/* and /etc/defaults/*
>
>
> ==
>
>
> Use &#x
Hello,
Each time I run mergemaster -UiF, it asks for a lot of file that I do
not have modified such as /dev/rc.d/* and /etc/defaults/*
==
Use 'd' to delete the temporary ./etc/network.subr
Use 'i&
On Fri, 12 Nov 2010, Leon Me?ner wrote:
Hi,
is there a trick besides using the rcs funktion of mergemaster to get
around having to look at every file in /etc for comparison?
I know there once was a bug in mergemaster but it's closed for a long
time now.
Example:
*** Displaying differ
On Fri, Nov 12, 2010 at 09:04, Leon Meßner
wrote:
> On Fri, Nov 12, 2010 at 09:40:01AM -0700, Warren Block wrote:
>> On Fri, 12 Nov 2010, Leon Me?ner wrote:
>>
>> > is there a trick besides using the rcs funktion of mergemaster to get
>> > around having
On Fri, 12 Nov 2010, Leon Me?ner wrote:
On Fri, Nov 12, 2010 at 09:40:01AM -0700, Warren Block wrote:
On Fri, 12 Nov 2010, Leon Me?ner wrote:
is there a trick besides using the rcs funktion of mergemaster to get
around having to look at every file in /etc for comparison?
I know there once
On Fri, Nov 12, 2010 at 09:40:01AM -0700, Warren Block wrote:
> On Fri, 12 Nov 2010, Leon Me?ner wrote:
>
> > is there a trick besides using the rcs funktion of mergemaster to get
> > around having to look at every file in /etc for comparison?
> > I know there once was
On Fri, 12 Nov 2010, Leon Me?ner wrote:
is there a trick besides using the rcs funktion of mergemaster to get
around having to look at every file in /etc for comparison?
I know there once was a bug in mergemaster but it's closed for a long
time now.
...
90% of the differences are just in
Hi,
is there a trick besides using the rcs funktion of mergemaster to get
around having to look at every file in /etc for comparison?
I know there once was a bug in mergemaster but it's closed for a long
time now.
Example:
*** Displaying differences between ./etc/periodic/daily/300.cal
gt;
> > You might also want to put this line in mergemaster.rc:
> >
> > DIFF_OPTIONS='-I$FreeBSD:.*[$]'
>
> I think it's already done by FREEBSD_ID (-F) in rc file.
Thanks for pointing that out. Also made me notice a bug in the
mergemaster manpage whic
Frank Shute writes:
> On Mon, Jul 26, 2010 at 06:18:22PM -0700, zaxis wrote:
>>
>>
>> that's great ! I will use /etc/mergemaster.rc to upgrade my FB 8.0.
>>
>
> You might also want to put this line in mergemaster.rc:
>
> DIFF_OPTIONS='-I$FreeBSD:.*[$]'
I think it's already done by FREEBSD_ID (
FF_OPTIONS='-I$FreeBSD:.*[$]'
>
> That makes mergemaster ignore changes in the CVS tags.
>
> With a good rc and a basic understanding of vi, you should be in good
> shape to make progress.
>
> I hated mergemaster when I first started using it but I love it now!
&
On Mon, Jul 26, 2010 at 06:18:22PM -0700, zaxis wrote:
>
>
> that's great ! I will use /etc/mergemaster.rc to upgrade my FB 8.0.
>
You might also want to put this line in mergemaster.rc:
DIFF_OPTIONS='-I$FreeBSD:.*[$]'
That makes mergemaster ignore changes in the CV
On 27 July 2010 11:09, b. f. wrote:
> On Monday 26 July 2010, zaxis wrote:
> > I want to upgrade my freebsd 8.0 to 8.1. I have read all the steps
> > about upgrading freebsd. I feel mergemaster is difficult to use e.g.
> > which parameters should i use ? (you may wis
On Monday 26 July 2010, zaxis wrote:
> I want to upgrade my freebsd 8.0 to 8.1. I have read all the steps
> about upgrading freebsd. I feel mergemaster is difficult to use e.g.
> which parameters should i use ? (you may wish to use -U or -ai or
> -Fi)
Well, obviously you will get
that's great ! I will use /etc/mergemaster.rc to upgrade my FB 8.0.
Mike Clarke-17 wrote:
>
> On Monday 26 July 2010, zaxis wrote:
>
>> I want to upgrade my freebsd 8.0 to 8.1. I have read all the steps
>> about upgrading freebsd. I feel mergemaster is diff
On Monday 26 July 2010, zaxis wrote:
> I want to upgrade my freebsd 8.0 to 8.1. I have read all the steps
> about upgrading freebsd. I feel mergemaster is difficult to use e.g.
> which parameters should i use ? (you may wish to use -U or -ai or
> -Fi)
I have the follo
On Sun, Jul 25, 2010 at 9:36 PM, Charlie Kester wrote:
> On Sun 25 Jul 2010 at 18:17:09 PDT zaxis wrote:
>
>>
>> I want to upgrade my freebsd 8.0 to 8.1. I have read all the steps about
>> upgrading freebsd. I feel mergemaster is difficult to use e.g. which
>> pa
On Sun 25 Jul 2010 at 18:17:09 PDT zaxis wrote:
I want to upgrade my freebsd 8.0 to 8.1. I have read all the steps about
upgrading freebsd. I feel mergemaster is difficult to use e.g. which
parameters should i use ? (you may wish to use -U or -ai or -Fi)
I usually use -p when invoking
I want to upgrade my freebsd 8.0 to 8.1. I have read all the steps about
upgrading freebsd. I feel mergemaster is difficult to use e.g. which
parameters should i use ? (you may wish to use -U or -ai or -Fi)
-
e^(π⋅i) + 1 = 0
--
View this message in context:
http://old.nabble.com/I
On Tuesday 11 August 2009 05:23:28 Arthur Chance wrote:
> Wayne Sierke wrote:
> > I lost practically all of my 'mergemaster pain' when I adopted the habit
> > of using it with -iUP options:
> >
> > -i Automatically install a
On Tue, 11 Aug 2009 08:52:36 -0600 (MDT), Warren Block
wrote:
> I prefer phooey mode: -FUi. Still works with -PFUi.
"PFui" is German for something like "Ugh". I think
that is NOT intended. :-)
--
Polytropon
>From Magdeburg, Germany
Happy FreeBSD user since 4.0
Andra moi ennepe, Mousa, ...
_
hing during mergemaster and devd.conf is messed
up. (Mergemaster is, undeniably, my least favorite utility).
I lost practically all of my 'mergemaster pain' when I adopted the
habit of using it with -iUP options:
-iAutomatically install any files that do not exist in the des-
--On Tuesday, August 11, 2009 01:18:32 -0500 Wayne Sierke
wrote:
On Sun, 2009-08-09 at 08:34 -0700, Richard Mahlerwein wrote:
I'm redoing the whole process in single user mode. My guess is I
goofed something during mergemaster and devd.conf is messed up.
(Mergemaster is, undeniabl
--- On Tue, 8/11/09, Wayne Sierke wrote:
> From: Wayne Sierke
> Subject: Don't let mergemaster beat you down [was Re: Failed update]
> To: mahle...@yahoo.com
> Cc: "FreeBSD-Questions"
> Date: Tuesday, August 11, 2009, 2:18 AM
> On Sun, 2009-08-09 at 08:34
in message <1249971512.63923.1045.ca...@predator-ii.buffyverse>,
wrote Wayne Sierke thusly...
>
> On Sun, 2009-08-09 at 08:34 -0700, Richard Mahlerwein wrote:
> > I'm redoing the whole process in single user mode. My guess is
> > I goofed something during mergem
Wayne Sierke wrote:
I lost practically all of my 'mergemaster pain' when I adopted the habit
of using it with -iUP options:
-i Automatically install any files that do not exist in the des-
tination directory.
-P Preserve files that you
On Sun, 2009-08-09 at 08:34 -0700, Richard Mahlerwein wrote:
> I'm redoing the whole process in single user mode. My guess is I
> goofed something during mergemaster and devd.conf is messed up.
> (Mergemaster is, undeniably, my least favorite utility).
I lost practically all of m
-BEGIN PGP SIGNED MESSAGE-
Hash: RIPEMD160
Mel Flynn wrote:
> On Sunday 26 April 2009 11:12:12 Frederique Rijsdijk wrote:
>> Bruce Cran wrote:
>>> On Sat, 25 Apr 2009 12:10:42 +0200
>>>
>>> Peter Schuller wrote:
>>>> I recently began te
On Sunday 26 April 2009 11:12:12 Frederique Rijsdijk wrote:
> Bruce Cran wrote:
> > On Sat, 25 Apr 2009 12:10:42 +0200
> >
> > Peter Schuller wrote:
> >> I recently began testing mergemaster -U since the perpetual "review
> >> diff of fil
Peter Schuller wrote:
> I recently began testing mergemaster -U since the perpetual "review
> diff of file I never touched" grows annoying real quick.
>
> Unfortunately I recently discovered that it does not seem to do what
> you might expect. For example it nuked my m
recent updates on two
machines, using -Ui to mergemaster.
After restoring them from back-up, I've added them to the exclude list
in mergemaster.rc as
IGNORE_FILES='/etc/motd /etc/namedb/named.conf /etc/mail/mailer.conf'
Until I saw your post and the other responses, I h
Bruce Cran wrote:
On Sat, 25 Apr 2009 12:10:42 +0200
Peter Schuller wrote:
I recently began testing mergemaster -U since the perpetual "review
diff of file I never touched" grows annoying real quick.
Unfortunately I recently discovered that it does not seem to do what
you mi
On Sat, 25 Apr 2009 12:10:42 +0200
Peter Schuller wrote:
> I recently began testing mergemaster -U since the perpetual "review
> diff of file I never touched" grows annoying real quick.
>
> Unfortunately I recently discovered that it does not seem to do what
> you mig
I recently began testing mergemaster -U since the perpetual "review
diff of file I never touched" grows annoying real quick.
Unfortunately I recently discovered that it does not seem to do what
you might expect. For example it nuked my mailer.conf on one machine,
and my /etc/namedb/
On Fri, 24 Apr 2009, Giorgos Keramidas wrote:
On Thu, 23 Apr 2009 14:54:25 -0700 (PDT), Annelise Anderson
wrote:
I'm running mergemaster as root (-v -i -c) on an upgrade to
stable (I rebooted with the new kernel but have not done
the install) and can't run mergemaster, with result
On Thu, 23 Apr 2009 14:54:25 -0700 (PDT), Annelise Anderson
wrote:
> I'm running mergemaster as root (-v -i -c) on an upgrade to
> stable (I rebooted with the new kernel but have not done
> the install) and can't run mergemaster, with result as follows:
>
> Default is
I'm running mergemaster as root (-v -i -c) on an upgrade to
stable (I rebooted with the new kernel but have not done
the install) and can't run mergemaster, with result as follows:
Default is to use /var/tmp/temproot as is
How should I deal with this? [Use the existing /var/tmp/t
On Apr 6, 2009, at 10:24 AM, Manolis Kiagias wrote:
Charles Howse wrote:
Actually, I wasn't asking about the CVS line with regard to
mergemaster. I realize that mergemaster will stop and ask about any
file in its list with a CVS line older than the new file.
What I really want to kn
Charles Howse wrote:
>
>
> Actually, I wasn't asking about the CVS line with regard to
> mergemaster. I realize that mergemaster will stop and ask about any
> file in its list with a CVS line older than the new file.
>
> What I really want to know is, let'
On Apr 6, 2009, at 7:03 AM, Manolis Kiagias wrote:
Charles Howse wrote:
Hi,
I'm upgrading form 4.6-RELEASE to 4.6-STABLE.
When I get to the *second* run of mergemaster (after installworld),
I'd be interested to hear the list's comments on using options to
start mergemaster.
Fo
Charles Howse wrote:
> Hi,
> I'm upgrading form 4.6-RELEASE to 4.6-STABLE.
> When I get to the *second* run of mergemaster (after installworld),
> I'd be interested to hear the list's comments on using options to
> start mergemaster.
>
> For example, have you
On Apr 6, 2009, at 5:43 AM, Charles Howse wrote:
Hi,
I'm upgrading form 4.6-RELEASE to 4.6-STABLE.
So sorry...that should be from 6.4-RELEASE to 6.4-STABLE
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/free
Hi,
I'm upgrading form 4.6-RELEASE to 4.6-STABLE.
When I get to the *second* run of mergemaster (after installworld),
I'd be interested to hear the list's comments on using options to
start mergemaster.
For example, have you had good luck with:
mergemaster -i -u (install
On Wed, Jan 7, 2009 at 10:55 PM, Peter Boosten wrote:
> matt donovan wrote:
> > On Wed, Jan 7, 2009 at 3:34 PM, Peter Boosten wrote:
> >>>
> >> Well, my point is that mergemaster shouldn't have to delete ALL
> accounts,
> >> just to add one. User
matt donovan wrote:
> On Wed, Jan 7, 2009 at 3:34 PM, Peter Boosten wrote:
>>>
>> Well, my point is that mergemaster shouldn't have to delete ALL accounts,
>> just to add one. User and group accounts can be added to the passwd/group
>> file *without* delet
On Wed, Jan 7, 2009 at 3:34 PM, Peter Boosten wrote:
> Albert Shih wrote:
>
>> Le 07/01/2009 à 07:06:53+0100, Peter Boosten a écrit
>>
>>> Johann Hasselbach wrote:
>>>
>>>> I was doing a src upgrade from 7.0 to 7.1
>>>>
>>&
> > Greetings. I have updated to 7.1 from a 6.2 box. Kernel built and >
> > installed successfully, world built successfully, however mergemaster is >
> > failing:> > $ mergemaster> *** Unable to find mtree database. Skipping
> > auto-upgrade.
I may b
I did mergemaster -p previously, my issue was resolved with this svn
commit fixing the build prefix in mergemaster:
http://svn.freebsd.org/viewvc/base/head/usr.sbin/mergemaster/mergemaster.sh?view=markup&pathrev=186678
Thanks for the suggestion though.
Floyd Skeren & Kelly LLP
Albert Shih wrote:
Le 07/01/2009 à 07:06:53+0100, Peter Boosten a écrit
Johann Hasselbach wrote:
I was doing a src upgrade from 7.0 to 7.1
After installkernel, i rebooted, and accidently ran "mergemaster"
instead of "mergemaster -p" before installworld. I ctrl-c'd o
Le 07/01/2009 à 07:06:53+0100, Peter Boosten a écrit
> Johann Hasselbach wrote:
> > I was doing a src upgrade from 7.0 to 7.1
> >
> > After installkernel, i rebooted, and accidently ran "mergemaster"
> > instead of "mergemaster -p" before installw
Greetings. I have updated to 7.1 from a 6.2 box. Kernel built and
installed successfully, world built successfully, however mergemaster is
failing:
$ mergemaster
*** Unable to find mtree database. Skipping auto-upgrade.
*** The directory specified for the temporary root environment,
/var
Yuri Pankov wrote:
> On Wed, Jan 07, 2009 at 07:06:53AM +0100, Peter Boosten wrote:
>>
>> Also: most scripts updated by mergemaster during 7.0->7.1 are only
>> version numbering diffs. Is there no smarter way to do this, apart from
>> typing 'i' every tim
Yuri Pankov writes:
> > Also: most scripts updated by mergemaster during 7.0->7.1 are only
> > version numbering diffs. Is there no smarter way to do this, apart from
> > typing 'i' every time?
>
> I think you want -U option (auto upgrade files that hav
On Wed, Jan 07, 2009 at 07:06:53AM +0100, Peter Boosten wrote:
> Johann Hasselbach wrote:
> > I was doing a src upgrade from 7.0 to 7.1
> >
> > After installkernel, i rebooted, and accidently ran "mergemaster"
> > instead of "mergemaster -p" befo
Johann Hasselbach wrote:
> I was doing a src upgrade from 7.0 to 7.1
>
> After installkernel, i rebooted, and accidently ran "mergemaster"
> instead of "mergemaster -p" before installworld. I ctrl-c'd once I
> realized what I had done, but the damage was do
I was doing a src upgrade from 7.0 to 7.1
After installkernel, i rebooted, and accidently ran "mergemaster"
instead of "mergemaster -p" before installworld. I ctrl-c'd once I
realized what I had done, but the damage was done.
It seems to have overwritten my pas
El Sáb 06 Sep 2008, Christian Laursen escribió:
> "Michael P. Soulier" <[EMAIL PROTECTED]> writes:
> > The downside of mergemaster is that it is only a 2-way merge, where a
> > 3-way would know better than you prompt you for changes that you
> > didn't mak
On Sep 6, 2008, at 1:20 PM, Christian Laursen wrote:
I always run mergemaster in auto upgrade mode. From the man page:
-U Attempt to auto upgrade files that have not been user
modi-
fied.
This can also be achieved by putting "AUTO_UPGRADE=yes" in
/etc/merg
"Michael P. Soulier" <[EMAIL PROTECTED]> writes:
> The downside of mergemaster is that it is only a 2-way merge, where a
> 3-way would know better than you prompt you for changes that you
> didn't make. This makes mergemaster far more tedious than it has to
> b
The downside of mergemaster is that it is only a 2-way merge, where a
3-way would know better than you prompt you for changes that you
didn't make. This makes mergemaster far more tedious than it has to
be. Has anyone considered a good 3-way merge tool?
I'm using Git for development
Jack Raats wrote:
after upgrade 6.3 to 7.0 mergemaster didn't do the job properly
After a normal reboot I get a lot of Warnings like
/etc/rc: WARNING: $variable_enable is not set properly - see rc.conf(5)
HOw to solve this problem???
Thanks
Jack
Rerun mergemaster.
When it asks you
after upgrade 6.3 to 7.0 mergemaster didn't do the job properly
After a normal reboot I get a lot of Warnings like
/etc/rc: WARNING: $variable_enable is not set properly - see rc.conf(5)
HOw to solve this problem???
Thanks
Jack
___
fr
> Who is working on FreeBSD update? Maybe I can make a feature request.
Or, even better, make a patch - FreeBSD is open source, everyone can work on it!
Sorry, couldn't resist :-). I know the above remark is generally not
very helpful for an average user; however, I was surprised to find out
th
> Chris Maness <[EMAIL PROTECTED]> writes:
>
>> I was wondering if it was possible to use mergemaster with the binary
>> update tool. It seemed like a much better way than freebsd-update
>> dumping me into vi. I don't understand what it wants me to do with
>
Chris Maness <[EMAIL PROTECTED]> writes:
> I was wondering if it was possible to use mergemaster with the binary
> update tool. It seemed like a much better way than freebsd-update
> dumping me into vi. I don't understand what it wants me to do with
> vi. Mergemas
I was wondering if it was possible to use mergemaster with the binary
update tool. It seemed like a much better way than freebsd-update
dumping me into vi. I don't understand what it wants me to do with vi.
Mergemaster is very clear. Can someone please shed light.
Chris M
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Garrett Cooper wrote:
> On Nov 27, 2007, at 7:45 PM, Aryeh M. Friedman wrote:
>
> I was thinking seeing the fact that I already have a cvs repo of
> -current does it make sense to just use CVS to update /etc
> instead of
> mergem
On Sun, 18 Nov 2007 13:01:56 +0100
Peter Schuller <[EMAIL PROTECTED]> wrote:
> > Isn't that what the -U option in mergemaster does?
> >
> >
> >-U Attempt to auto upgrade files that have not been user
> >
1 - 100 of 221 matches
Mail list logo
