On Mon, May 6, 2013 at 6:59 AM, John Baldwin <j...@freebsd.org> wrote:
> On Saturday, May 04, 2013 3:06:12 pm Dimitry Andric wrote: > > On May 4, 2013, at 20:51, m...@freebsd.org wrote: > > > On Sat, May 4, 2013 at 11:49 AM, Matthew D Fleming <m...@freebsd.org> > wrote: > > > Author: mdf > > > Date: Sat May 4 18:49:04 2013 > > > New Revision: 250249 > > > URL: http://svnweb.freebsd.org/changeset/base/250249 > > ...lots of changed properties... > > > stable/8/sys/xen/ (props changed) > > > > > > This seems like an excessive amount of mergeinfo properties. Is > stable/8 > just borked that way (compared to 9) or did my svn client mess up somehow > (which wouldn't make much sense since it worked for stable/9 okay)? > > > > > > I'm using svn 1.6.13 on this laptop. > > > > It will probably help if you upgrade to svn 1.7, which has marginally > better > merge logic. For some reason, 1.6 tends to add lots of property changes to > each subdirectory, when merging. This was mostly fixed in 1.7. > > 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? Thanks, matthew _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
