On Tue, Nov 29, 2016 at 10:19:03PM +0100, Stefan Sperling wrote:
> (Running 'svn add DIR' after
> 'svn revert -R DIR' will also merge the files, but schedules an undesirable
> replacement as well.)
Sorry, the above should say 'svn resolved DIR' instead of 'svn revert -R DIR'.
On Tue, Nov 29, 2016 at 08:00:31PM +0100, Olaf van der Spek wrote:
> On Tue, Nov 29, 2016 at 7:38 PM, Stefan Sperling wrote:
> > On Tue, Nov 29, 2016 at 07:23:21PM +0100, Olaf van der Spek wrote:
> >> On Wed, Nov 23, 2016 at 12:36 PM, Johan Corveleyn
> >> wrote:
> >> > Maybe Stefan Sperling (in
On Tue, Nov 29, 2016 at 7:38 PM, Stefan Sperling wrote:
> On Tue, Nov 29, 2016 at 07:23:21PM +0100, Olaf van der Spek wrote:
>> On Wed, Nov 23, 2016 at 12:36 PM, Johan Corveleyn wrote:
>> > Maybe Stefan Sperling (in cc) or others working on the tree conflict
>> > resolver have more insight on thi
On Tue, Nov 29, 2016 at 07:23:21PM +0100, Olaf van der Spek wrote:
> On Wed, Nov 23, 2016 at 12:36 PM, Johan Corveleyn wrote:
> > Maybe Stefan Sperling (in cc) or others working on the tree conflict
> > resolver have more insight on this ...?
>
> Stefan?
>
> For directories it seems like a no-br
On Wed, Nov 23, 2016 at 12:36 PM, Johan Corveleyn wrote:
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
On Tue, Nov 22, 2016 at 10:13 PM, Bert Huijben wrote:
> Or set
> [miscellany]
> global-ignores = *
>
> In ~/.subversion/config
That does the trick, thanks a lot!
--
Olaf
I'm happy to announce the release of Apache Subversion 1.9.5.
Please choose the mirror closest to you by visiting:
http://subversion.apache.org/download/#recommended-release
This release fixes one security issue:
CVE-2016-8734:
Unrestricted XML entity expansion in mod_dontdothat and
I'm happy to announce the release of Apache Subversion 1.8.17.
Please choose the mirror closest to you by visiting:
http://subversion.apache.org/download/#supported-releases
This release fixes one security issue:
CVE-2016-8734:
Unrestricted XML entity expansion in mod_dontdothat and
