Date: Mon, 6 May 2013 16:33:31 -0400 From: Eitan Adler <eadler@freebsd.org> To: Dimitry Andric <dim@freebsd.org> Cc: mdf@freebsd.org, "src-committers@freebsd.org" <src-committers@freebsd.org>, John Baldwin <jhb@freebsd.org>, svn-src-stable@freebsd.org, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, svn-src-stable-8@freebsd.org Subject: Re: svn commit: r250249 - in stable/8/sys: . amd64/amd64 dev/sound i386/i386 kern Message-ID: <CAF6rxgn%2BuFeoPKJGD6zGmwY3N3zxOdJZ0%2BDc1ynewq_JbSc0xw@mail.gmail.com> In-Reply-To: <AB58AB2A-0C47-4E0F-ADF8-221625764884@freebsd.org> References: <201305041849.r44In5HK095619@svn.freebsd.org> <CAMBSHm93hTk-fWmeeKyX-e%2B9o4r1CMEyRJVA9D%2BTXd%2B38T1gTA@mail.gmail.com> <9AFDCE3E-8967-428A-89C2-4C9F9888E040@FreeBSD.org> <201305060959.52379.jhb@freebsd.org> <CAMBSHm-kKtAyMterKLSTvA39JO7Xzn4Cvo8QgkAyadhu=uOH-A@mail.gmail.com> <AB58AB2A-0C47-4E0F-ADF8-221625764884@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 6 May 2013 15:02, Dimitry Andric <dim@freebsd.org> wrote: > On May 6, 2013, at 20:27, mdf@FreeBSD.org wrote: >> On Mon, May 6, 2013 at 6:59 AM, John Baldwin <jhb@freebsd.org> wrote: > ... >> Also, because of 1.7 merges adding more subdir mergeinfo, 1.6 merges now add >> a lot more mergeinfo. 1.6 should really be avoided at this point for merges >> if at all possible. >> >> Should I back this out, then, and re-do? And why did this happen on stable/8, but not stable/9 for the same MFC? > > No, the spurious mergeinfo is not harmful, just a bit ugly. It should be removed manually, by an svn expert (with a tiny bit of OCD... ;-). > > I think the stable/8 tree just contains more of this spurious merge info, simply because a lot of that tree was created when svn 1.6 was the current version. It may be useful to block these commits using a pre-commit hook? -- Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAF6rxgn%2BuFeoPKJGD6zGmwY3N3zxOdJZ0%2BDc1ynewq_JbSc0xw>