subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Dag-Erling Smørgrav <...@des.no>
Subject Re: Tree conflict resolution considered harmful
Date Thu, 30 Aug 2018 09:34:18 GMT
Stefan Sperling <stsp@elego.de> writes:
> Could you provide a shell script I can use to actually run the problematic
> merge myself in a working copy of the appropriate subdirectory of the FreeBSD
> repository?

svn co -q svn://svn.freebsd.org/base/head@338344
cd head/crypto/openssh
svn merge --non-interactive -c338344 \^/vendor-crypto/openssh/dist .

DES
-- 
Dag-Erling Smørgrav - des@des.no

Mime
View raw message