On Mon, Dec 5, 2016 at 12:51 AM, Johan Corveleyn wrote:
> I don't understand what you're trying to say here. There are always
> files involved, no? I don't care about the directories themselves in
No, see my initial example:
# svn up /etc
Updating '/etc':
C /etc/php5
A /etc/php5/cli
A /
On Sun, Dec 4, 2016 at 7:07 PM, Olaf van der Spek wrote:
> On Sun, Dec 4, 2016 at 6:27 PM, Johan Corveleyn wrote:
>> On Sun, Dec 4, 2016 at 11:32 AM, Olaf van der Spek wrote:
>> So do you agree that the --force behaviour (just blindly incorporating
>> local files, without any warning) should *no
On Sun, Dec 4, 2016 at 10:17 PM, Daniel Shahaf wrote:
> Johan Corveleyn wrote on Sun, Dec 04, 2016 at 18:27:48 +0100:
>> It's impossible to say now which files were there before, and which
>> were added by the checkout (OK, the unversioned items were certainly
>> "local files", but the versioned o
Johan Corveleyn wrote on Sun, Dec 04, 2016 at 18:27:48 +0100:
> It's impossible to say now which files were there before, and which
> were added by the checkout (OK, the unversioned items were certainly
> "local files", but the versioned ones ... who knows?
Couldn't you look for files and empty di
On Sun, Dec 4, 2016 at 6:27 PM, Johan Corveleyn wrote:
> On Sun, Dec 4, 2016 at 11:32 AM, Olaf van der Spek wrote:
> So do you agree that the --force behaviour (just blindly incorporating
> local files, without any warning) should *not* be the default?
I'm not sure..
Why can't it be the default
On Sun, Dec 04, 2016 at 11:32:47AM +0100, Olaf van der Spek wrote:
> On Sun, Dec 4, 2016 at 1:04 AM, Johan Corveleyn wrote:
> > I think the most annoying consequence of accidentally checking out
> > over an existing directory, without any conflict detection (if the
> > --force behaviour would be t
On Sun, Dec 4, 2016 at 11:32 AM, Olaf van der Spek wrote:
> On Sun, Dec 4, 2016 at 1:04 AM, Johan Corveleyn wrote:
>> I think the most annoying consequence of accidentally checking out
>> over an existing directory, without any conflict detection (if the
>> --force behaviour would be the default)
On Sat, Dec 03, 2016 at 10:11:49PM +0100, Olaf van der Spek wrote:
> On Sat, Dec 3, 2016 at 10:07 PM, Stefan Sperling wrote:
> > On Sat, Dec 03, 2016 at 06:42:11PM +0100, Olaf van der Spek wrote:
> >> On Tue, Nov 29, 2016 at 10:19 PM, Stefan Sperling wrote:
> >> >> >> For directories it seems lik
On Sun, Dec 4, 2016 at 1:04 AM, Johan Corveleyn wrote:
> I think the most annoying consequence of accidentally checking out
> over an existing directory, without any conflict detection (if the
> --force behaviour would be the default), would be that you cannot
> easily undo the operation. You have
On Sat, Dec 3, 2016 at 10:11 PM, Olaf van der Spek wrote:
> On Sat, Dec 3, 2016 at 10:07 PM, Stefan Sperling wrote:
>> On Sat, Dec 03, 2016 at 06:42:11PM +0100, Olaf van der Spek wrote:
>>> On Tue, Nov 29, 2016 at 10:19 PM, Stefan Sperling wrote:
>>> >> >> For directories it seems like a no-brai
On Sat, Dec 03, 2016 at 06:42:11PM +0100, Olaf van der Spek wrote:
> On Tue, Nov 29, 2016 at 10:19 PM, Stefan Sperling wrote:
> >> >> For directories it seems like a no-brainer to avoid the conflict.
> >> >
> >> > Indeed, adding a resolver option for this should not be very difficult.
> >>
> >> I'
On Sat, Dec 3, 2016 at 10:07 PM, Stefan Sperling wrote:
> On Sat, Dec 03, 2016 at 06:42:11PM +0100, Olaf van der Spek wrote:
>> On Tue, Nov 29, 2016 at 10:19 PM, Stefan Sperling wrote:
>> >> >> For directories it seems like a no-brainer to avoid the conflict.
>> >> >
>> >> > Indeed, adding a reso
On Tue, Nov 29, 2016 at 10:19 PM, Stefan Sperling wrote:
>> >> For directories it seems like a no-brainer to avoid the conflict.
>> >
>> > Indeed, adding a resolver option for this should not be very difficult.
>>
>> I'd opt for not having a conflict in the first place.
>
> There is a reason the n
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 4:31 PM, Olaf van der Spek wrote:
> On Tue, Nov 22, 2016 at 9:50 AM, Johan Corveleyn wrote:
>> On Tue, Nov 22, 2016 at 8:56 AM, Olaf van der Spek wrote:
>>> Hi,
>>>
>>> How does one adopt / merge the update from the repo into local
>>> unversioned directories?
>>> Using R
Olaf van der Spek wrote on Tue, Nov 22, 2016 at 10:19:06 +0100:
> On Tue, Nov 22, 2016 at 10:11 AM, Stefan Sperling wrote:
> > 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
On Tue, Nov 22, 2016 at 10:11 AM, Stefan Sperling wrote:
> This side-steps your actual question but are you sure you want to
> version files in your /etc directory with Subversion?
No ;)
> Subversion does not version file permissions. You may end up with
> sensitive files being readable by users
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
On Tue, Nov 22, 2016 at 8:56 AM, 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':
>C /etc/php5
>A /etc/php5/cli
>A /etc/php5/cli/
23 matches
Mail list logo
