svn commit: r184781 - head/usr.sbin/mergemaster
trhodes at FreeBSD.org
Sun Nov 9 05:58:15 PST 2008
On Sun, 9 Nov 2008 10:25:51 +0000
Alexey Dokuchaev <danfe at FreeBSD.org> wrote:
> On Sun, Nov 09, 2008 at 11:11:33AM +0100, Alexander Leidinger wrote:
> > Quoting Maxim Sobolev <sobomax at FreeBSD.org> (from Sun, 9 Nov 2008
> > 07:58:23 +0000 (UTC)):
> > >Author: sobomax
> > >Date: Sun Nov 9 07:58:23 2008
> > >New Revision: 184781
> > >URL: http://svn.freebsd.org/changeset/base/184781
> > >
> > >Log:
> > > Ignore files that only differ in CVS Id tag.
> > I would like to have (ideally automatic) replacement of files in this
> > case.
> Seconded. Methinks it would be nice to have CVS Id's updated, either
> automagically or via interactive process, but certainly not silently
Doesn't "mergemaster -Ui" just do that? And yes, I agree,
ignoring files this way is probably a bad idea.
More information about the svn-src-head