New mergemaster option to install files that differ only by $FreeBSD

[Doug Barton]

Andreas Tobler wrote:
> Doug Barton wrote:
>> This was already discussed on -stable recently, so I've committed the
>> change in order to get it MFCed prior to the 7.2 code freeze.
>>
>> Would those of you who were concerned about this issue during the last
>> round of discussions please test this new option and report back?
> 
> An understanding question here, should this also work when upgrading
> from cvs based install to an svn based install?

Yes, assuming that you've checked out the sources properly and
actually have the svn Id string. I'm not sure how you got what you got
there, but when I check out the sources with svn I get something like
this:

# $FreeBSD: head/etc/pam.d/ftpd 170510 2007-06-10 18:57:20Z yar $

Assuming you've run mergemaster on this installation previously you
could use the -U option to install new files that you haven't modified.


hth,

Doug


> This is what I get here:
> 
> ----
>  *** Displaying differences between ./etc/pam.d/ftpd and installed version:
> 
> --- /etc/pam.d/ftpd     2009-01-03 23:32:10.000000000 +0100
> +++ ./etc/pam.d/ftpd    2009-03-25 22:00:53.000000000 +0100
> @@ -1,5 +1,5 @@
>  #
> -# $FreeBSD: src/etc/pam.d/ftpd,v 1.19.6.1 2008/11/25 02:59:29 kensmith
> Exp $
> +# $FreeBSD$
>  #
>  # PAM configuration for the "ftpd" service
>  #
> 
>   Use 'd' to delete the temporary ./etc/pam.d/ftpd
>   Use 'i' to install the temporary ./etc/pam.d/ftpd
>   Use 'm' to merge the temporary and installed versions
>   Use 'v' to view the diff results again
> ----
> 
> 
> TIA,
> Andreas
> _______________________________________________
> freebsd-current at freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-current
> To unsubscribe, send any mail to "freebsd-current-unsubscribe at freebsd.org"
> 


-- 

    This .signature sanitized for your protection