Hi,
basically a follow-up patch for the previous patch (resolving
--accept=working for binary conflicts).
Separate patch since this change is technically not necessary to resolve
the test failure the previous fix resolved.
[[[
For consistent behavior use the same conflict resolution option for bi
Hi all,
Yesterday I made a new wiki page to create an overview of the Tree
Conflict Resolution tests we have, and where there is still a lot of
work to do for test coverage:
https://wiki.apache.org/subversion/TreeConflictTests.
There are three tables currently (one per "operation" (merge, update,
On Thu, Oct 13, 2016 at 05:59:01PM +0200, Stefan wrote:
> On 10/13/2016 5:26 PM, Patrick Steinhardt wrote:
> > sion re-adds the result pool to
> > `svn_client_conflict_option_get_lazel`.
>
> > diff --git a/subversion/include/svn_client.h
> > b/subversion/include/svn_client.h
> > index 9bbe62b..f45
On 14 October 2016 at 10:27, Stefan Sperling wrote:
> On Thu, Oct 13, 2016 at 05:59:01PM +0200, Stefan wrote:
>> On 10/13/2016 5:26 PM, Patrick Steinhardt wrote:
>> > sion re-adds the result pool to
>> > `svn_client_conflict_option_get_lazel`.
>>
>> > diff --git a/subversion/include/svn_client.h
>
On 10/14/2016 10:27 AM, Stefan Sperling wrote:
> On Thu, Oct 13, 2016 at 05:59:01PM +0200, Stefan wrote:
>> On 10/13/2016 5:26 PM, Patrick Steinhardt wrote:
>>> sion re-adds the result pool to
>>> `svn_client_conflict_option_get_lazel`.
>>> diff --git a/subversion/include/svn_client.h
>>> b/subvers
On 13 October 2016 at 17:26, Patrick Steinhardt wrote:
> Hi,
>
> the third version re-adds the result pool to
> `svn_client_conflict_option_get_lazel`.
>
[...]
> @@ -582,15 +604,16 @@ prompt_string(const resolver_option_t *options,
> }
>else
> {
> - opt = options
On 14 October 2016 at 11:43, Ivan Zhakov wrote:
> On 13 October 2016 at 17:26, Patrick Steinhardt wrote:
>> Hi,
>>
>> the third version re-adds the result pool to
>> `svn_client_conflict_option_get_lazel`.
>>
> [...]
>> @@ -582,15 +604,16 @@ prompt_string(const resolver_option_t *options,
>>
On 14 October 2016 at 00:29, Stefan wrote:
> On 10/13/2016 11:38 AM, Stefan wrote:
>> On 10/13/2016 11:08 AM, Stefan wrote:
>>> On 10/10/2016 11:39 PM, Stefan wrote:
On 10/10/2016 6:12 PM, Ivan Zhakov wrote:
> On 10 October 2016 at 17:53, Stefan wrote:
>> On 8/28/2016 11:32 PM, Bert
On 10/13/2016 2:54 PM, Stefan wrote:
> On 10/12/2016 5:00 PM, 'Stefan Sperling' wrote:
>> I'm actually surprised that we made this change in 1.7.
>>
>> If 'svn checkout' sees an existing directory the most likely situation is
>> that the user has made a mistake. Leaving behind a working copy full o
On 12 October 2016 at 16:28, Patrick Steinhardt
wrote:
> Hi,
>
> attached is a patch to reject checkouts to already existing
> directories when `--force` is not given. This is according to
> `svn co --help`.
>
> [[
> Reject checkout to existing paths without force
>
> * subversion/svn/checkout-cmd
On 14 October 2016 at 12:06, Ivan Zhakov wrote:
> On 14 October 2016 at 11:43, Ivan Zhakov wrote:
>> On 13 October 2016 at 17:26, Patrick Steinhardt wrote:
>>> Hi,
>>>
>>> the third version re-adds the result pool to
>>> `svn_client_conflict_option_get_lazel`.
>>>
>> [...]
>>> @@ -582,15 +604,16
Hi,
attached patch fixes compatibility with ISO C90. It fixes
trailing commas in enum lists as well as one case where variadic
macros are used, which are a feature of C99. What it does not fix
is strings with overlength (C90 only allows for fixed strings
with a maximum length of 509 characters).
On 10/14/2016 12:19 PM, Ivan Zhakov wrote:
> On 14 October 2016 at 00:29, Stefan wrote:
>> On 10/13/2016 11:38 AM, Stefan wrote:
>>> On 10/13/2016 11:08 AM, Stefan wrote:
On 10/10/2016 11:39 PM, Stefan wrote:
> On 10/10/2016 6:12 PM, Ivan Zhakov wrote:
>> On 10 October 2016 at 17:53,
On Fri, Oct 14, 2016 at 03:35:48PM +0200, Stefan wrote:
> Thanks for taking the time to review the patch, Ivan (and also stsp).
> After talking to stsp, here's a different approach to solve the issue
> without the need for adding a new parameter to the public API.
>
> (all tests pass on Windows an
On 10/14/2016 4:05 PM, Stefan Sperling wrote:
> On Fri, Oct 14, 2016 at 03:35:48PM +0200, Stefan wrote:
>> Thanks for taking the time to review the patch, Ivan (and also stsp).
>> After talking to stsp, here's a different approach to solve the issue
>> without the need for adding a new parameter to
On 14 October 2016 at 15:24, Patrick Steinhardt
wrote:
> Hi,
>
> attached patch fixes compatibility with ISO C90. It fixes
> trailing commas in enum lists as well as one case where variadic
> macros are used, which are a feature of C99. What it does not fix
> is strings with overlength (C90 only a
Hi,
following patch adds a test case for issue #4642: ""svn update
--set-depth=exclude" exits prematurely, leaving repo in need of cleanup"
[1].
[[[
Add an XFail test for issue #4642 (Setting depth to exclude for a path
containing unversioned files requires a cleanup afterwards).
* subversion/te
Stefan Hett writes:
>if (option == NULL)
> -return svn_error_createf(SVN_ERR_CLIENT_CONFLICT_OPTION_NOT_APPLICABLE,
> - NULL,
> - _("Inapplicable conflict resolution option "
> - "given for conflicted pa
Hi,
currently, call library-provided resolve option labels have a
leading uppercase character, but all client-specific options are
lowercase only. This patch improves upon this situation.
[[
Uppercase client-specific resolve option labels.
* subversion/svn/conflict-callbacks.c:
(extra_resolver
I applied your patch on trunk and nominated it for the next 1.9 release. I
created a similar patch for 1.8 as the code has the same bug there. I think the
problem became visible after checking the accepted failures was improved in our
ra-serf library.
Bert
Sent from my Windows 10 phone
From: D
Stefan wrote on Fri, Oct 14, 2016 at 17:30:57 +0200:
> Add an XFail test for issue #4642 (Setting depth to exclude for a path
> containing unversioned files requires a cleanup afterwards).
Looks good overall. Just a few minor questions:
> +def fold_tree_with_unversioned_items(sbox):
> + "unvers
21 matches
Mail list logo
