Svn wrapper? [pasted from a Q. on the forum] ... To resolve "conflicts remaining"

Charles Swiger cswiger at mac.com
Thu Oct 17 22:35:52 UTC 2013


Hi--

On Oct 17, 2013, at 2:05 PM, Jeffrey Bouquet <jeffreybouquet at yahoo.com> wrote:
[ ... ]
> Anyone knows of a succinct svn command for use in such situations, or if a wrapper
> could be crafted that puts forth the series of commands that would take less
> time than a new src or ports checkout?

Have you tried "svn revert -R /usr/ports" or similar?

% svn co svn://svn.freebsd.org/base/stable/9 FreeBSD-9
A    FreeBSD-9/share
A    FreeBSD-9/share/skel
A    FreeBSD-9/share/skel/dot.cshrc
A    FreeBSD-9/share/skel/dot.rhosts
A    FreeBSD-9/share/skel/dot.mail_aliases
A    FreeBSD-9/share/skel/dot.mailrc
[ ... ]
% echo 'this is a local change' >> FreeBSD-9/share/skel/dot.cshrc
% svn status FreeBSD-9/share/skel/dot.cshrc
M       FreeBSD-9/share/skel/dot.cshrc
% svn revert -R FreeBSD-9
Reverted 'FreeBSD-9/share/skel/dot.cshrc'
% svn status FreeBSD-9/share/skel/dot.cshrc
%

Regards,
-- 
-Chuck



More information about the freebsd-ports mailing list