Oliver Fromme wrote:
Doug Barton wrote:
The attached patch adds a -F option to automatically install files
when only the FreeBSD $Ids differ. I've tested this and it seems to do
what the people concerned about this issue are asking for.
That seems to be a useful feature.
Thanks.
On Wed, 18 Mar 2009, Doug Barton wrote:
Oliver Fromme wrote:
Doug Barton wrote:
The attached patch adds a -F option to automatically install files
when only the FreeBSD $Ids differ. I've tested this and it seems to do
what the people concerned about this issue are asking for.
Doug Barton wrote:
The attached patch adds a -F option to automatically install files
when only the FreeBSD $Ids differ. I've tested this and it seems to do
what the people concerned about this issue are asking for.
That seems to be a useful feature. You need to quote the
dollar signs,
Daniel O'Connor docon...@gsoft.com.au wrote:
I wonder how hard it would be to add 3 way merging (like
sysutils/etcmerge) to mergemaster..
One complication: to do a 3-way merge you have to have the common
ancestor. To ensure the initial availability of such would require
some infrastructure
-BEGIN PGP SIGNED MESSAGE-
Hash: RIPEMD160
The attached patch adds a -F option to automatically install files
when only the FreeBSD $Ids differ. I've tested this and it seems to do
what the people concerned about this issue are asking for.
If someone affected by this issue could please
On Friday 13 March 2009 17:56:17 per...@pluto.rain.com wrote:
Daniel O'Connor docon...@gsoft.com.au wrote:
I wonder how hard it would be to add 3 way merging (like
sysutils/etcmerge) to mergemaster..
One complication: to do a 3-way merge you have to have the common
ancestor. To ensure the
Hello!
As long time FreeBSD user I am concerned about RELEASE and STABLE
configuration files inconsistency. No big deal but really annoying if
you want to upgrade systems occassionally. The problem is that there is
huge amount of old files between RELEASE and STABLE config files- more
On Thu, 12 Mar 2009, Andrei Kolu wrote:
Hello!
As long time FreeBSD user I am concerned about RELEASE and STABLE
configuration files inconsistency.
This topic was covered recently, you might want to check the archives.
-# $FreeBSD: src/etc/rc.d/network_ipv6,v 1.37.18.1 2008/11/25 02:59:29
Doug Barton wrote:
On Thu, 12 Mar 2009, Andrei Kolu wrote:
Hello!
As long time FreeBSD user I am concerned about RELEASE and STABLE
configuration files inconsistency.
This topic was covered recently, you might want to check the archives.
-# $FreeBSD: src/etc/rc.d/network_ipv6,v 1.37.18.1
Andrei Kolu wrote:
Doug Barton wrote:
-# $FreeBSD: src/etc/rc.d/network_ipv6,v 1.37.18.1 2008/11/25
02:59:29 kensmith Exp $
+# $FreeBSD: src/etc/rc.d/network_ipv6,v 1.37 2004/10/07 13:55:26 mtm
Exp $
What you're seeing is an artifact of the way that CVS deals with
cutting a release. Even
On Thu, Mar 12, 2009 at 12:22:19AM -0700, Doug Barton wrote:
What you're seeing is an artifact of the way that CVS deals with cutting a
release. Even though the content of the files is the same, the CVS Id is
updated in the release branch so that you can track revisions to that file
that
On Thursday 12 March 2009 18:17:53 Doug Barton wrote:
I hope this issue will be resolved.
What you're seeing is a mildly annoying side effect of how CVS works.
There is nothing to resolve.
I wouldn't classify it as mildly annoying that you need to manually intervene
in every single file..
On Thursday 12 March 2009 3:22:19 am Doug Barton wrote:
On Thu, 12 Mar 2009, Andrei Kolu wrote:
Hello!
As long time FreeBSD user I am concerned about RELEASE and STABLE
configuration files inconsistency.
This topic was covered recently, you might want to check the archives.
-#
This is what I have in my /etc/mergemaster.rc; it will
probably help in your case:
DIFF_FLAG='-Bub'
DIFF_OPTIONS='-I$FreeBSD:.*[$]'
IGNORE_MOTD=yes
The first line causes diff to not display changes that
only affect whitespace. The second line ignores the CVS
id lines, so that files will compare
On Friday 13 March 2009 01:35:27 Oliver Fromme wrote:
PS: I think the above options should _not_ be on by
default, because that would be a POLA violation.
Those people who want them can easily add them to their
mergemaster.rc file.
Perhaps they should be suggested in the man page..
I agree
On Thu, Mar 12, 2009 at 04:05:27PM +0100, Oliver Fromme wrote:
This is what I have in my /etc/mergemaster.rc; it will
probably help in your case:
DIFF_FLAG='-Bub'
DIFF_OPTIONS='-I$FreeBSD:.*[$]'
IGNORE_MOTD=yes
Yes, it helps and I like it. But I'm forced to put it to each and every
box I
Eugene Grosbein wrote:
On Thu, Mar 12, 2009 at 04:05:27PM +0100, Oliver Fromme wrote:
This is what I have in my /etc/mergemaster.rc; it will
probably help in your case:
DIFF_FLAG='-Bub'
DIFF_OPTIONS='-I$FreeBSD:.*[$]'
IGNORE_MOTD=yes
Newer versions of mergemaster prefer the following:
17 matches
Mail list logo
