Log:
[[[ Followup to r1420334: Adding new tests.
* subversiom/bindings/swig/python/tests/checksum.py
Writing new tests to ensure robustness of svn_checksum_match(),
svn_checksum_dup() and svn_checksum_empty_checksum().
Patch by: Shivani Poddar ]]]
Regards,
Shivani Poddar,
irc-nick - trinity_28
The attached patch fixes issue #4316 'Merge errors out after resolving
conflicts'.
I have a particular question about the notifications printed after applying
this patch -- see the end of this mail.
The patch makes the libsvn_client merge function call the resolver for all
conflicts raised whi
> -Original Message-
> From: Julian Foad [mailto:julianf...@btopenworld.com]
> Sent: vrijdag 15 maart 2013 22:01
> To: Subversion Development
> Cc: Philip Martin; Stefan Sperling; Bert Huijben
> Subject: Conflict resolver callback design
>
> A long email, for folks interested in conflict
On Thu, Mar 14, 2013 at 4:50 PM, Paul Burba wrote:
> Whenever we approach a release we always face the question: Which of
> our open issues are blockers for the upcoming release? Obviously as
> we approach 1.8, anything with a target milestone of 1.8.0 is
> (supposedly) a blocker. But what about
A long email, for folks interested in conflict resolution.
I have been evaluating our conflict resolution callback support, partly in the
course of studying how to provide better conflict resolution, and partly in the
course of issue #4316 -- fixing 'merge' so that it continues to the next
revi
On 15.03.2013 19:29, Paul Burba wrote:
[snip]
C:\SVN\diff-scripts-1.8-dev>svn merge -r24000:23999
http://tortoisesvn.googlecode.com/svn/trunk/contrib/diff-scripts/diff-xls.js
diff-xls.js
Argh! I forgot the --ignore-ancestry flag: you have to pass
--ignore-ancestry when merging, then it wil
On Fri, Mar 15, 2013 at 2:03 PM, Stefan Küng wrote:
> On 15.03.2013 18:59, Paul Burba wrote:
>>
>> On Fri, Mar 15, 2013 at 1:52 PM, Stefan Küng
>> wrote:
>>>
>>> On 15.03.2013 18:46, Paul Burba wrote:
On Fri, Mar 15, 2013 at 1:23 PM, Stefan Küng
wrote:
>
>
> Hi,
>
On 15.03.2013 18:59, Paul Burba wrote:
On Fri, Mar 15, 2013 at 1:52 PM, Stefan Küng wrote:
On 15.03.2013 18:46, Paul Burba wrote:
On Fri, Mar 15, 2013 at 1:23 PM, Stefan Küng
wrote:
Hi,
using a build from todays trunk:
$ svn co http://tortoisesvn.googlecode.com/svn/trunk/contrib/diff-scr
On Fri, Mar 15, 2013 at 1:52 PM, Stefan Küng wrote:
> On 15.03.2013 18:46, Paul Burba wrote:
>>
>> On Fri, Mar 15, 2013 at 1:23 PM, Stefan Küng
>> wrote:
>>>
>>> Hi,
>>>
>>> using a build from todays trunk:
>>>
>>> $ svn co http://tortoisesvn.googlecode.com/svn/trunk/contrib/diff-scripts
>>> wc
>
Philip Martin wrote:
> Michael Pilato" writes:
>
>> [Deferring further comment until we unearth the reasoning behind switch
>> supporting --ignore-ancestry at all.]
>
> You added it in r1087015 as a backwards compatiblity switch when fixing
> issue http://subversion.tigris.org/issues/show_bug
On 15.03.2013 18:46, Paul Burba wrote:
On Fri, Mar 15, 2013 at 1:23 PM, Stefan Küng wrote:
Hi,
using a build from todays trunk:
$ svn co http://tortoisesvn.googlecode.com/svn/trunk/contrib/diff-scripts wc
$ cd wc
$ svn merge -r23995:23994
http://tortoisesvn.googlecode.com/svn/trunk/contrib/di
Reviewing the various classes around conflicts. This is an area where
it seems like a lot has happened, so I might not even be finding
everything that has been done.
The only Java class that seems like it is missing something is ConflictVersion
I see this in the C code but not Java:
1678 /*
On Fri, Mar 15, 2013 at 1:23 PM, Stefan Küng wrote:
> Hi,
>
> using a build from todays trunk:
>
> $ svn co http://tortoisesvn.googlecode.com/svn/trunk/contrib/diff-scripts wc
> $ cd wc
> $ svn merge -r23995:23994
> http://tortoisesvn.googlecode.com/svn/trunk/contrib/diff-scripts/diff-doc.js
> dif
I have never used the class, but the JavaHL CommitItemStateFlags are
missing values also.
On Fri, Mar 15, 2013 at 1:40 PM, Mark Phippard wrote:
> One of the areas that often falls thru the cracks with JavaHL is the
> notifications. Looking at current HEAD, it looks pretty good though.
> The m
One of the areas that often falls thru the cracks with JavaHL is the
notifications. Looking at current HEAD, it looks pretty good though.
The most recent two notifications appear to be all that are missing:
1250 /** A copy from a foreign repository has started
1251* @since New in 1.8. */
Hi,
using a build from todays trunk:
$ svn co http://tortoisesvn.googlecode.com/svn/trunk/contrib/diff-scripts wc
$ cd wc
$ svn merge -r23995:23994
http://tortoisesvn.googlecode.com/svn/trunk/contrib/diff-scripts/diff-doc.js
diff-doc.js
this segfaults in libsvn_client/merge.c, line 7407 beca
Mark Phippard writes:
> Just starting to do some JavaHL review as requested.
>
> There is a problem with how this change was made. The rules for changing a
> method are pretty much the same as they are for C. We cannot simply add
> new options to the existing method we need to add those in a "m
Just starting to do some JavaHL review as requested.
There is a problem with how this change was made. The rules for changing a
method are pretty much the same as they are for C. We cannot simply add
new options to the existing method we need to add those in a "move2" method.
In the SVNClient c
"C. Michael Pilato" writes:
> [Deferring further comment until we unearth the reasoning behind switch
> supporting --ignore-ancestry at all.]
You added it in r1087015 as a backwards compatiblity switch when fixing
issue http://subversion.tigris.org/issues/show_bug.cgi?id=3848.
--
Certified & S
On 03/14/2013 09:58 PM, julianf...@apache.org wrote:
> Author: julianfoad
> Revision: 1456664
> Modified property: svn:log
>
> Modified: svn:log at Fri Mar 15 01:58:15 2013
> --
> --- svn:log (original)
> +++ svn:log Fri M
On 03/14/2013 04:50 PM, Paul Burba wrote:
> In the interests of sanity I propose we bulk assign all issues filed
> before some arbitrary point in time to the 'unscheduled' milestone. I
> suggest using the date 1.7.0 was tagged as that point, under the
> assumption that any issues filed prior were
>> URL: http://svn.apache.org/r1456636
>> Log:
>> * subversion/svn/svn.c
>> (svn_cl__cmd_table): In the help for 'svn resolve', add the missing value
>> 'working' for the '--accept' option.
[...]
>> - "('base', 'working', 'mine-conflict',\n"
>
22 matches
Mail list logo
