subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Olaf van der Spek ...@vdspek.org>
Subject Adopting unversioned directory on svn up
Date Tue, 22 Nov 2016 07:56:40 GMT
Hi,

How does one adopt / merge the update from the repo into local
unversioned directories?
Using R marks the directory for deletion.

# svn up /etc
Updating '/etc':
   C /etc/php5
   A /etc/php5/cli
   A /etc/php5/cli/conf.d
   A /etc/php5/cgi
   A .
Updated to revision 55.
Tree conflict on '/etc/php5'
   > local dir unversioned, incoming dir add upon update
Select: (r) mark resolved, (p) postpone, (q) quit resolution, (h) help: h

  (r)  - accept current working copy state
  (p)  - resolve the conflict later  [postpone]
  (q)  - postpone all remaining conflicts
  (h)  - show this help (also '?')
Words in square brackets are the corresponding --accept option arguments.

Select: (r) mark resolved, (p) postpone, (q) quit resolution, (h) help:


-- 
Olaf

Mime
View raw message