Date: Tue, 18 Jun 2013 21:52:23 +0700 From: Alexey Dokuchaev <danfe@nsu.ru> To: Bryan Drewery <bdrewery@FreeBSD.org> Cc: ports@FreeBSD.org Subject: Re: "svn mv" and changing files at the same time: still prohibited Message-ID: <20130618145223.GA10324@regency.nsu.ru> In-Reply-To: <51C05107.90603@FreeBSD.org> References: <20130617141857.GA93727@regency.nsu.ru> <51C05107.90603@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Jun 18, 2013 at 07:22:31AM -0500, Bryan Drewery wrote: > Solution: Save your target changes, undo the move (revert rtcw), 'svn > update' in rtcw, and mv again. Then copy in your changes and commit. > Don't forget to 'svn add' any files as well. > > This should fix it. Indeed, thanks for the hint! The culprit was that I 1st changed Makefile, *then* svn mv'ed, while I should have 'svn mv' first an updated, pristine directory, apply necessary changes, and finally commit. ./danfe
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130618145223.GA10324>