[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Tree conflict resolution considered harmful

From: Dag-Erling Smørgrav <des_at_des.no>
Date: Thu, 30 Aug 2018 11:34:18 +0200

Stefan Sperling <stsp_at_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_at_338344
cd head/crypto/openssh
svn merge --non-interactive -c338344 \^/vendor-crypto/openssh/dist .

DES 

-- 
Dag-Erling Smørgrav - des_at_des.no
Received on 2018-08-30 11:34:30 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.