Date: Mon, 14 May 2007 00:46:33 +0400 From: "Andrew Pantyukhin" <infofarmer@FreeBSD.org> To: "Kris Kennaway" <kris@obsecurity.org> Cc: ports@freebsd.org Subject: Re: HEADS UP: xorg 7.2 ready for testing Message-ID: <cb5206420705131346i3150bfdam9bb2781a0212fb11@mail.gmail.com> In-Reply-To: <20070512211419.GA28267@xor.obsecurity.org> References: <20070510212817.GA67897@xor.obsecurity.org> <20070512153043.GA12201@graf.pompo.net> <cb5206420705121400j7600519ara3f239e1149053ee@mail.gmail.com> <20070512210454.GA28045@xor.obsecurity.org> <cb5206420705121411u21df3e48x83a7fe81ea8fedbd@mail.gmail.com> <20070512211419.GA28267@xor.obsecurity.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 5/13/07, Kris Kennaway <kris@obsecurity.org> wrote: > On Sun, May 13, 2007 at 01:11:15AM +0400, Andrew Pantyukhin wrote: > > On 5/13/07, Kris Kennaway <kris@obsecurity.org> wrote: > > >On Sun, May 13, 2007 at 01:00:51AM +0400, Andrew Pantyukhin wrote: > > >> mergebase.sh failed, probably because my system is quite > > >> dirty. Even after I removed the conflicting files, it just > > >> failed. I've made the merge myself and been living happily > > >> ever since (so far). > > > > > >Hmm, would be nice to know why. > > > > I'll try to look closer at it on my laptop. Something tells > > me it'll fail there too, because it's my development system > > and it's as dirty as it gets. > > Running sh -x will help. It fails at line 81. The problem is when there are empty dirs in /usr/X11R6, they cause "File exists" errors, but don't get deleted. Reproducible this way: # rm -rf /usr/X11R6 # mkdir /usr/X11R6 # <run mergebase>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?cb5206420705131346i3150bfdam9bb2781a0212fb11>