The real question here is: why is the RCSid changing when the file
isn't?
Sometimes things get changed and then backed out to their original state,
but you cannot keep the original RCSID
To Unsubscribe: send mail to [EMAIL PROTECTED]
with unsubscribe freebsd-current in the body of the
On Wed, Feb 06, 2002 at 02:13:08PM -0600, David W. Chapman Jr. wrote:
What I think mergemaster should do is compere the file with the original
checked out one it claims to be and if it's the same, it should just
update silently.. i.e. if the user didn't change anything in th old one
he's
Take a look ath this diff:
--- /etc/nsmb.conf Wed Jan 30 05:31:21 2002
+++ ./etc/nsmb.conf Wed Feb 6 16:20:55 2002
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/nsmb.conf,v 1.4 2002/01/29 00:23:34 cjc Exp $
+# $FreeBSD: src/etc/nsmb.conf,v 1.3 2002/01/07 08:41:55 sheldonh Exp $
#
# smbfs
Diffs like there show up for COUNTLESS times in mergemaster. In fact,
nothing changed except the cvs id. Why am I asked about these in
mergemaster? Is there a way to ignore files that only have the cvsid
changed? This would speed up the mergemaster run considerably...
mergemaster only
David == David W Chapman [EMAIL PROTECTED] writes:
David mergemaster only checks to see if RCSID's are different by
David default, I forget which option, but there is one to actually
David diff the two files when doing its inital compare, but the
David RCSID's would be different
The real question here is: why is the RCSid changing when the file
isn't?
Sometimes things get changed and then backed out to their original state,
but you cannot keep the original RCSID
To Unsubscribe: send mail to [EMAIL PROTECTED]
with unsubscribe freebsd-current in the body of the
David == David W Chapman [EMAIL PROTECTED] writes:
David Sometimes things get changed and then backed out to their
David original state, but you cannot keep the original RCSID
I can see that happening on the head, but this also happens
on stable ...
To Unsubscribe: send mail to [EMAIL
I can see that happening on the head, but this also happens
on stable ...
One example of it happening to -stable was the addittion of www to
master.passwd, www has been added and removed a few times from -stable. I'm
not trying to say that this explains all the times that it happens, just
At 11:34 AM -0700 2/6/02, Lyndon Nerenberg wrote:
David == David W Chapman [EMAIL PROTECTED] writes:
David mergemaster only checks to see if RCSID's are different by
David default, I forget which option, but there is one to actually
David diff the two files when doing its
What I think mergemaster should do is compere the file with the original
checked out one it claims to be and if it's the same, it should just
update silently.. i.e. if the user didn't change anything in th old one
he's unlikely to want to change anything in the new one
(maybe a datafile
What I think mergemaster should do is compere the file with the original
checked out one it claims to be and if it's the same, it should just
update silently.. i.e. if the user didn't change anything in th old one
he's unlikely to want to change anything in the new one
(maybe a
11 matches
Mail list logo
