Date: Sat, 20 Feb 2021 14:51:36 +0100 From: Ganael Laplanche <martymac@freebsd.org> To: Alexey Dokuchaev <danfe@freebsd.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r566074 - in head: archivers/par2cmdline-tbb biology/bowtie2 cad/opencascade devel devel/onetbb devel/onetbb/files devel/tbb graphics/blender graphics/blender/files graphics/embree grap... Message-ID: <4833515.YNO7O01DYZ@home.martymac.org> In-Reply-To: <20210220061438.GA66080@FreeBSD.org> References: <202102191514.11JFEkbg088782@repo.freebsd.org> <20210220061438.GA66080@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Saturday, February 20, 2021 7:14:38 AM CET Alexey Dokuchaev wrote: Hello Alexey, > You forgot to repocopy it off the `devel/tbb', it would be nice if > you could fix that while newly added port has no history, by removing > and "svn cp"ing properly. Thanks! I've missed that important "detail". Unfortunately, my commit is blocked with the following message: ===> Do not replace files as this may lose history: "devel/onetbb" Here is what I've done so far: $ svn up # Keep a local copy of current port's contents $ tar czf /tmp/onetbb.tgz devel/onetbb # Do the actual repo-copy $ svn rm devel/onetbb $ svn cp devel/tbb devel/onetbb # Re-create port's contents $ rm -rf devel/onetbb/* $ tar xzf /tmp/onetbb.tgz $ svn rm <extra files> $ svn status R + devel/onetbb M + devel/onetbb/Makefile M + devel/onetbb/distinfo D + devel/onetbb/files/patch-Doxyfile D + devel/onetbb/files/patch-build-BSD.inc D + devel/onetbb/files/patch-build_FreeBSD.gcc.inc D + devel/onetbb/files/patch-include-tbb-tbb_config.h D + devel/onetbb/files/tbb.pc.in D + devel/onetbb/files/version_info_FreeBSD.sh M + devel/onetbb/pkg-descr M + devel/onetbb/pkg-plist $ svn ci ===> Do not replace files as this may lose history: "devel/onetbb" As a side note, on my machine, svn is actually /usr/ports/Tools/scripts/psvn. Am I missing something ? Thanks for your help, -- Ganael LAPLANCHE <ganael.laplanche@martymac.org> http://www.martymac.org | http://contribs.martymac.org FreeBSD: martymac <martymac@FreeBSD.org>, http://www.FreeBSD.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4833515.YNO7O01DYZ>