Date: Fri, 27 Oct 2017 07:37:44 +0100 From: Matthew Seaman <matthew@FreeBSD.org> To: freebsd-questions@freebsd.org Subject: Re: Clearing subversion issue Message-ID: <72c2d673-121d-956a-d4dd-dea5d8393f34@FreeBSD.org> In-Reply-To: <CAN6yY1tYz249TDjf6uanhZcLaVpRw3FvrsLnzZxMgKBzQP2xgw@mail.gmail.com> References: <CAN6yY1tYz249TDjf6uanhZcLaVpRw3FvrsLnzZxMgKBzQP2xgw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --icMbKntnV1VOM6VveXCriaefKXnFwxKgE Content-Type: multipart/mixed; boundary="bc7mdUx5E4NriDHH5NJC6Rs7X2sQWKWvW"; protected-headers="v1" From: Matthew Seaman <matthew@FreeBSD.org> To: freebsd-questions@freebsd.org Message-ID: <72c2d673-121d-956a-d4dd-dea5d8393f34@FreeBSD.org> Subject: Re: Clearing subversion issue References: <CAN6yY1tYz249TDjf6uanhZcLaVpRw3FvrsLnzZxMgKBzQP2xgw@mail.gmail.com> In-Reply-To: <CAN6yY1tYz249TDjf6uanhZcLaVpRw3FvrsLnzZxMgKBzQP2xgw@mail.gmail.com> --bc7mdUx5E4NriDHH5NJC6Rs7X2sQWKWvW Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: quoted-printable On 27/10/2017 06:52, Kevin Oberman wrote: > Instead of resolving conflicts cleanly, I simply deleted all of the por= t > and run "svn up". It ran cleanly, but one file was not downloaded, the > recently added patch. >=20 > I ran "svn status" which returns: > D C print/freetype2/files/extra-patch-fix_size_metrics.diff > > local unversioned, incoming file add upon update This is svn not overwriting an un-versioned file. If you know that you want the patch from upstream, try removing extra-patch-fix_size_metrics.diff and updating again. > ! C www/linux-c6-flashplugin11 > > local dir edit, incoming dir delete or move upon update > ! www/linux-c6-flashplugin11/Makefile > ! www/linux-c6-flashplugin11/distinfo > ! www/linux-c6-flashplugin11/pkg-descr > ! www/linux-c6-flashplugin11/pkg-message > ! www/linux-c6-flashplugin11/pkg-plist This is svn expecting to rename that directory and all its contents, and being confused because some things have already disappeared. > I have no idea what triggered the flashplugin11 issue. It's been gone f= or a > long time, but this is the first time I have run a status on ports in a= > very long time. >=20 > I suspect that there is an easy to fix these, but I have yet to find it= =2E In general, 'svn revert -R foo/bar' will undo local changes and give you copies of the foo/bar port's files exactly as they appear in the repository. You should also look at 'svn status' to find files in your tree that don't exist in the repository. svn does have a habit of leaving some files in your tree which eg. git would remove -- this is particularly noticeable with 'svn rm' Cheers, Matthew --bc7mdUx5E4NriDHH5NJC6Rs7X2sQWKWvW-- --icMbKntnV1VOM6VveXCriaefKXnFwxKgE Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQJ8BAEBCgBmBQJZ8tQ/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NTNBNjhCOTEzQTRFNkNGM0UxRTEzMjZC QjIzQUY1MThFMUE0MDEzAAoJELsjr1GOGkATyIgQAK8zGxsLg3yGtJAyEJgqpbCz EmqmgZahDJptMLErPA88YAifKkE/V2hWtQyhj73A4HveU4HL2AcIsg97qCvhR1ko TuwsO63w4mHo6ietWiv4yiSuThDu42b3I1OZ8tZVmkztRwYeMd6SdzTbdQakuuO0 UitpEalxnCGAHeZlw8flHRs3mQaPgtjGGvvKUpGpSkYxrbeqZ8ucdhnW+MVnsurN pB2iIqBoSwY9jQNpRaL1kj7DVtSdj9F1/pWrP3bpVBgxOxiom/yC5YBK1y6x3JzD rzSq4OJ5AU7BzUKI95+bYWrblDK1N1y0vnYmXdH2RYyL9w97t8wplhMvN8i5t3zv 7pJvhWZ48SMKMxvpB50b6i4LgXypVLmwM4zgvNMFwsQMv7s6N9flIWea35oEzVWj 4wiImq5rOqn2Vo3oxxHEFlczqTrZWaeoMV23lQtXI70U7C63T6q0XCDAeVfHcmlh 5EK88n/qlBghjdwEyuGt100jsOLFOgl54nvhpsiD+Ov/b3MQSeXkTd3T0SfK5ZCJ XmPBGd8ndJtuWCwvrYHc/ihQWzgagGbXeA97TCUoxhugq7jwnJTdmO1mVh0AnOtE v2cE0whyQ8HmKgnTGQQC47LseFRrYSnPE1eKTorBq0NcjVW9oUeZPVMmrYL6L1gN khM0Tqy5Y1jW1oOlrHtB =6NzJ -----END PGP SIGNATURE----- --icMbKntnV1VOM6VveXCriaefKXnFwxKgE--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?72c2d673-121d-956a-d4dd-dea5d8393f34>