Date: Sun, 03 Jun 2007 11:57:51 +0200 From: Hans Nieser <h.nieser@xs4all.nl> To: Ryan Mesa <vytalelementz@yahoo.com> Cc: freebsd-x11@freebsd.org Subject: Re: merge script Message-ID: <4662909F.6050302@xs4all.nl> In-Reply-To: <556373.43800.qm@web60515.mail.yahoo.com> References: <556373.43800.qm@web60515.mail.yahoo.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Ryan Mesa wrote: > Hi, > > I just updated xorg from version 6.9 to 7.2. There is a merge script the UPDATED file suggests to use, I ran after the update but I received this error message: > > Files that exist both in /usr/local and /usr/X11R6 have been found as shown above. Merging will not continue. > While some such files are safe to remove as they will be regenerated (like /usr/X11R6/man/whatis), some you might want to move away somewhere safe, and some might point to conflicts in ports. > For this script to continue, you need to either move these files away from /usr/X11R6 or delete them. If you don't know what to do about a particular file, ask on x11@FreeBSD.org mailing list. > The list is saved in /tmp/mergebase.3HIXDrU8. > > I was hoping that someone could shed some light on what I could delete and what needs to be moved to a safe location as directed. Any help is appreciated. Thank you. I am not sure if I could help, but I don't think anyone could unless you mention which specific file you are confused about, or perhaps the entire list of files that was saved in /tmp/mergebase.3HIXDrU8 . :)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4662909F.6050302>