Re: svn commit: r1406870 - in /subversion/trunk/subversion: libsvn_wc/update_editor.c libsvn_wc/wc_db_wcroot.c tests/cmdline/special_tests.py

2012-11-07 Thread Philip Martin
phi...@apache.org writes: > Author: philip > Date: Wed Nov 7 23:49:06 2012 > New Revision: 1406870 > > URL: http://svn.apache.org/viewvc?rev=1406870&view=rev > Log: > Fix issue 4091, symlink-ness change causes spurious tree-conflict. > > * subversion/libsvn_wc/update_editor.c > (close_file): On

Re: svn commit: r1406870 - in /subversion/trunk/subversion: libsvn_wc/update_editor.c libsvn_wc/wc_db_wcroot.c tests/cmdline/special_tests.py

2012-11-07 Thread Branko Čibej
On 08.11.2012 03:19, Philip Martin wrote: > phi...@apache.org writes: > >> Author: philip >> Date: Wed Nov 7 23:49:06 2012 >> New Revision: 1406870 >> >> URL: http://svn.apache.org/viewvc?rev=1406870&view=rev >> Log: >> Fix issue 4091, symlink-ness change causes spurious tree-conflict. >> >> * sub

Re: svn commit: r1406870 - in /subversion/trunk/subversion: libsvn_wc/update_editor.c libsvn_wc/wc_db_wcroot.c tests/cmdline/special_tests.py

2012-11-07 Thread Daniel Shahaf
Branko Čibej wrote on Thu, Nov 08, 2012 at 04:13:52 +0100: > On 08.11.2012 03:19, Philip Martin wrote: > > phi...@apache.org writes: > > > >> Author: philip > >> Date: Wed Nov 7 23:49:06 2012 > >> New Revision: 1406870 > >> > >> URL: http://svn.apache.org/viewvc?rev=1406870&view=rev > >> Log: > >>

Re: svn commit: r1406870 - in /subversion/trunk/subversion: libsvn_wc/update_editor.c libsvn_wc/wc_db_wcroot.c tests/cmdline/special_tests.py

2012-11-07 Thread Branko Čibej
On 08.11.2012 05:26, Daniel Shahaf wrote: > Branko Čibej wrote on Thu, Nov 08, 2012 at 04:13:52 +0100: >> I believe that the correct approach would be to always treat a changed >> node kind (that's either the appearance/disappearance of the svn:symlink >> property, or a change of the initial keywor

Re: svn commit: r1406870 - in /subversion/trunk/subversion: libsvn_wc/update_editor.c libsvn_wc/wc_db_wcroot.c tests/cmdline/special_tests.py

2012-11-07 Thread Daniel Shahaf
Branko Čibej wrote on Thu, Nov 08, 2012 at 06:13:22 +0100: > On 08.11.2012 05:26, Daniel Shahaf wrote: > > Branko Čibej wrote on Thu, Nov 08, 2012 at 04:13:52 +0100: > >> I believe that the correct approach would be to always treat a changed > >> node kind (that's either the appearance/disappearanc

Re: svn commit: r1406870 - in /subversion/trunk/subversion: libsvn_wc/update_editor.c libsvn_wc/wc_db_wcroot.c tests/cmdline/special_tests.py

2012-11-07 Thread Daniel Shahaf
Daniel Shahaf wrote on Thu, Nov 08, 2012 at 09:07:07 +0200: > Branko Čibej wrote on Thu, Nov 08, 2012 at 06:13:22 +0100: > > On 08.11.2012 05:26, Daniel Shahaf wrote: > > > Branko Čibej wrote on Thu, Nov 08, 2012 at 04:13:52 +0100: > > >> I believe that the correct approach would be to always treat

RE: svn commit: r1406870 - in /subversion/trunk/subversion: libsvn_wc/update_editor.c libsvn_wc/wc_db_wcroot.c tests/cmdline/special_tests.py

2012-11-08 Thread Bert Huijben
> -Original Message- > From: Daniel Shahaf [mailto:d...@daniel.shahaf.name] > Sent: donderdag 8 november 2012 08:07 > To: dev@subversion.apache.org > Subject: Re: svn commit: r1406870 - in /subversion/trunk/subversion: > libsvn_wc/update_editor.c libsvn_wc/wc_db_wcroot

RE: svn commit: r1406870 - in /subversion/trunk/subversion: libsvn_wc/update_editor.c libsvn_wc/wc_db_wcroot.c tests/cmdline/special_tests.py

2012-11-08 Thread Bert Huijben
> -Original Message- > From: Daniel Shahaf [mailto:d...@daniel.shahaf.name] > Sent: donderdag 8 november 2012 08:10 > To: dev@subversion.apache.org > Subject: Re: svn commit: r1406870 - in /subversion/trunk/subversion: > libsvn_wc/update_editor.c libsvn_wc/wc_db_wcroot

Re: svn commit: r1406870 - in /subversion/trunk/subversion: libsvn_wc/update_editor.c libsvn_wc/wc_db_wcroot.c tests/cmdline/special_tests.py

2012-11-08 Thread 'Daniel Shahaf'
Bert Huijben wrote on Thu, Nov 08, 2012 at 10:01:18 +0100: > > -Original Message- > > From: Daniel Shahaf [mailto:d...@daniel.shahaf.name] > > Sent: donderdag 8 november 2012 08:10 > > To: dev@subversion.apache.org > > Subject: Re: svn commit: r1406870 - i

Re: svn commit: r1406870 - in /subversion/trunk/subversion: libsvn_wc/update_editor.c libsvn_wc/wc_db_wcroot.c tests/cmdline/special_tests.py

2012-11-08 Thread Philip Martin
"Bert Huijben" writes: > +1 on not allowing to change the symlinkness of existing files. > And +1 on still allowing it on *new* files. > > In the update editor we could change the behavior of incoming symlink > changes to be handled as a delete + add, introducing a tree conflict > (and a local re

Re: svn commit: r1406870 - in /subversion/trunk/subversion: libsvn_wc/update_editor.c libsvn_wc/wc_db_wcroot.c tests/cmdline/special_tests.py

2012-11-08 Thread Philip Martin
"Bert Huijben" writes: > In the update editor we could change the behavior of incoming symlink > changes to be handled as a delete + add, introducing a tree conflict > (and a local replacement of the incoming node to keep the original > state) if there are local changes. > > I think I should be a

RE: svn commit: r1406870 - in /subversion/trunk/subversion: libsvn_wc/update_editor.c libsvn_wc/wc_db_wcroot.c tests/cmdline/special_tests.py

2012-11-08 Thread Bert Huijben
> -Original Message- > From: Philip Martin [mailto:philip.mar...@wandisco.com] > Sent: donderdag 8 november 2012 13:31 > To: Bert Huijben > Cc: 'Daniel Shahaf'; dev@subversion.apache.org > Subject: Re: svn commit: r1406870 - in /subversion/trunk/subversion:

Re: svn commit: r1406870 - in /subversion/trunk/subversion: libsvn_wc/update_editor.c libsvn_wc/wc_db_wcroot.c tests/cmdline/special_tests.py

2012-11-08 Thread Peter Samuelson
[Daniel Shahaf] > it's what allows Windows users to create versioned symlinks: > > printf "link bar" > foo && svn add foo && svn ps svn:special yes foo && svn > ci > > If we don't like changing the specialness of a local addition, we could > deprecate (or break) that behaviour and have people

Re: svn commit: r1406870 - in /subversion/trunk/subversion: libsvn_wc/update_editor.c libsvn_wc/wc_db_wcroot.c tests/cmdline/special_tests.py

2012-11-08 Thread Daniel Shahaf
Peter Samuelson wrote on Thu, Nov 08, 2012 at 11:01:37 -0600: > > [Daniel Shahaf] > > it's what allows Windows users to create versioned symlinks: > > > > printf "link bar" > foo && svn add foo && svn ps svn:special yes foo && > > svn ci > > > > If we don't like changing the specialness of a

Re: svn commit: r1406870 - in /subversion/trunk/subversion: libsvn_wc/update_editor.c libsvn_wc/wc_db_wcroot.c tests/cmdline/special_tests.py

2012-11-08 Thread Daniel Shahaf
Peter Samuelson wrote on Thu, Nov 08, 2012 at 11:01:37 -0600: > > [Daniel Shahaf] > > it's what allows Windows users to create versioned symlinks: > > > > printf "link bar" > foo && svn add foo && svn ps svn:special yes foo && > > svn ci > > > > If we don't like changing the specialness of a

Re: svn commit: r1406870 - in /subversion/trunk/subversion: libsvn_wc/update_editor.c libsvn_wc/wc_db_wcroot.c tests/cmdline/special_tests.py

2012-11-08 Thread Peter Samuelson
[Daniel Shahaf] > Did you mean: > $ printf 'link bar' > foo Yes I did mean that - thanks. > > $ svn add --config-option config:miscellany:enable-auto-props=yes \ > > --config-option config:auto-props:foo=svn:special=1 foo > > A foo > > > > $ ls -l foo > >