subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Stefan Sperling <s...@elego.de>
Subject Re: Adopting unversioned directory on svn up
Date Tue, 22 Nov 2016 09:11:38 GMT
On Tue, Nov 22, 2016 at 08:56:40AM +0100, Olaf van der Spek wrote:
> 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':

This side-steps your actual question but are you sure you want to
version files in your /etc directory with Subversion?

Subversion does not version file permissions. You may end up with
sensitive files being readable by users other than root (e.g. files
such as SSH private host keys).

If you have such sensitive files in the repostory, you'll have to make
sure that permissions are still set properly after each svn operation.
This script can help:
https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/asvn

>    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