> 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 mes
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
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
>
> 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 da
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 that
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
>
> 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
> "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
> 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 mes
> "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
> 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 onl
11 matches
Mail list logo
