On Wednesday, January 12, 2011 3:12:47 pm Nathan Whitehorn wrote: > On 01/12/11 10:33, John Baldwin wrote: > > On Wednesday, January 12, 2011 9:55:03 am Nathan Whitehorn wrote: > >> Author: nwhitehorn > >> Date: Wed Jan 12 14:55:02 2011 > >> New Revision: 217309 > >> URL: http://svn.freebsd.org/changeset/base/217309 > >> > >> Log: > >> Update dialog to version 20100428. This changes the license under which > >> dialog is distributed from GPLv2 to LGPLv2 and introduces a number of new > >> features and a new and better libdialog API. The existing libdialog will > >> be kept temporarily as libodialog for compatibility purposes until sade, > >> sysinstall and tzsetup have been either updated or replaced. > >> > >> __FreeBSD_version is now 900030. > > > > Hmm, did you import this to the vendor area first or did you just add it > > directly to contrib? > > I did it wrong, and put it directly into contrib. I'm not sure what is > the best way to fix it. Here are the possibilities that I came up with: > - Fix it when there's an update > - Import it into vendor now for historical purposes > - Import it into vendor and synthesize mergeinfo on contrib/dialog.
The last should be fine. Just doing a merge --record-only to bootstrap the mergeinfo should be sufficient. Likely you need to flatten the vendor tree (see the page on the wiki about subversion imports). -- John Baldwin _______________________________________________ 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"
