On Tuesday, June 12, 2012, C. Michael Pilato wrote:
> On 06/10/2012 12:16 AM, Bert Huijben wrote:
> >> @@ -1214,7 +1215,11 @@ start_xml(void *userData, const char *ra
> >>
> >>svn_ra_serf__expand_ns(&name, parser->state->ns_list, raw_name);
> >>
> >> - parser->error = parser->start(parser, na
On Tuesday, June 12, 2012, C. Michael Pilato wrote:
> On 06/10/2012 09:13 AM, Justin Erenkrantz wrote:
> > One question: what happens when the WC's pristine gets corrupted. That
> is,
> > we originally get the pristine properly, stash it in the local DB, but
> > something happens later and that f
Attached please find revised patch that added a comment to the JNIObject
class to
indicate that it is not part of the public API.
[[[
JavaHL: New method for creating java objects linked to their C++ counterpart
[ in subversion/bindings/javahl/native ]
* SVNBase.cpp,
SVNBase.h
(createCppBound
On 06/10/2012 12:16 AM, Bert Huijben wrote:
>> @@ -1214,7 +1215,11 @@ start_xml(void *userData, const char *ra
>>
>>svn_ra_serf__expand_ns(&name, parser->state->ns_list, raw_name);
>>
>> - parser->error = parser->start(parser, name, attrs, scratch_pool);
>> + err = parser->start(parser, name,
On 06/10/2012 09:13 AM, Justin Erenkrantz wrote:
> One question: what happens when the WC's pristine gets corrupted. That is,
> we originally get the pristine properly, stash it in the local DB, but
> something happens later and that file changes content due to corruption.
>
> Specifically:
>
>
On Mon, Jun 11, 2012 at 8:39 AM, Vladimir Berezniker wrote:
>
>
> On Mon, Jun 11, 2012 at 6:20 AM, Hyrum K Wright > wrote:
>
>> On Thu, Jun 7, 2012 at 4:03 AM, Vladimir Berezniker
>> wrote:
>> > Hi All,
>> >
>> > The intention if this patch is to introduce reusable logic for creating
>> java
>>
[[[
Add a regression test for r1348822.
* subversion/tests/cmdline/stat_tests.py
(status_depth_update_local_modifications): Add a test for "svn status -u" call
with different --depth values on a working copy with local modifications.
]]]
Index: subversion/tests/cmdline/stat_tests.py
Hyrum K Wright wrote:
> Philip Martin wrote:
>> Hyrum K Wright writes:
>>> Julian,
>>> I'm seeing the following XPASSs on trunk:
>>> At least one test XPASSED, checking /Users/Hyrum/dev/svn-trunk2/tests.log
>>> XPASS: merge_symmetric_tests.py 7: merge_to_and_fro_1_1
>>> XPASS: merge_symmetric_test
Thank you very much Hyrum Wright,
I apologize for posting on the wrong place then (what would be the best
place to discuss this on the svn community?)
Would you suggest any pointers to look more into this? (Code files or Some
reference material that could cover this in natural language?)
Best,
Hi, Philip,
Von: MARTIN PHILIP [codematt...@ntlworld.com]" im Auftrag von "Philip
Martin
> Philip Martin writes:
>> Markus Schaber writes:
>>> Here's the second iteration:
>>>
>>> [[[
>>> libsvn_wc: no conflict for identical files
>>>
>>> [ in subversion/libsvn_wc ]
>>>
>>> * merge.c
>>> (me
Philip Martin writes:
> Markus Schaber writes:
>
>> Here's the second iteration:
>>
>> [[[
>> libsvn_wc: no conflict for identical files
>>
>> [ in subversion/libsvn_wc ]
>>
>> * merge.c
>> (merge_file_trivial): Successful report merged when incoming file is
>> identical to existing, locally
Markus Schaber writes:
> Here's the second iteration:
>
> [[[
> libsvn_wc: no conflict for identical files
>
> [ in subversion/libsvn_wc ]
>
> * merge.c
> (merge_file_trivial): Successful report merged when incoming file is
> identical to existing, locally modified file.
>
> [ in subversion/te
Hi, Philip,
Von: MARTIN PHILIP [codematt...@ntlworld.com]
>Markus Schaber writes:
>
>>> One thing that is still not quite right is that the final state of
>>> the file is unmodified but NODES.last_mod_time is not set. It's not
>>> caused by your patch but ideally we would update last_mod_time.
>
Markus Schaber writes:
>> One thing that is still not quite right is that the final state of
>> the file is unmodified but NODES.last_mod_time is not set. It's not
>> caused by your patch but ideally we would update last_mod_time.
>
> Is there anything I can do to set it at that place? Or should
Hi,
Von: MARTIN PHILIP
> Markus Schaber writes:
>> To be honest, after thinking twice, I'm not sure whether my change
>> actually changes user-visible behaviour for non-binary files. My
>> assumption was that merge_text_file() call following the
>> merge_file_trivial() eventually produces the sa
Markus Schaber writes:
> To be honest, after thinking twice, I'm not sure whether my change
> actually changes user-visible behaviour for non-binary files. My
> assumption was that merge_text_file() call following the
> merge_file_trivial() eventually produces the same result in that case,
> just
Hi, Martin,
Von: MARTIN PHILIP [codematt...@ntlworld.com]
>> What about removing XFail from update_binary_file_3?
> The code path you are changing is for all files, not just binary files,
> so it affects all merges. The documentation for merge_file_trivial
> needs to be updated.
Thanks for your
On Mon, Jun 11, 2012 at 9:09 AM, Hyrum K Wright
wrote:
> On Mon, Jun 11, 2012 at 2:58 PM, Vladimir Berezniker
> wrote:
> >
> >
> > On Mon, Jun 11, 2012 at 6:56 AM, Hyrum K Wright <
> hyrum.wri...@wandisco.com>
> > wrote:
> >>
> >> On Thu, Jun 7, 2012 at 5:09 AM, Vladimir Berezniker >
> >> wrote:
/home/neels/svnbench/20120611-122702
Started at Mon Jun 11 12:27:02 UTC 2012
*Disclaimer:* this tests only file://-URL access on a GNU/Linux VM.
This is intended to measure changes in performance of the local working
copy layer, *only*. These results are *not* generally true for everyone
For anyone interested, attached is the shell script I use to generate a log
message template for a particular svn diff.
It runs 'svn status' on the given target(s) to find what files to include, then
'svn diff' for each file, and writes to stdout a log message and diff in the
following format:
Philip Martin writes:
> Markus Schaber writes:
>
>> [[[
>> libsvn_wc: no conflict for identical files
>>
>> [ insubversion/libsvn_wc ]
>>
>> * merge.c
>> (merge_file_trivial): Successful report merged when incoming file is
>> identical to existing, locally modified file.
>>
>> ]]]
>>
>> Thank
Markus Schaber writes:
> [[[
> libsvn_wc: no conflict for identical files
>
> [ insubversion/libsvn_wc ]
>
> * merge.c
> (merge_file_trivial): Successful report merged when incoming file is
> identical to existing, locally modified file.
>
> ]]]
>
> Thank you,
> Markus Schaber
>
> Index: subve
On Mon, Jun 11, 2012 at 2:58 PM, Vladimir Berezniker wrote:
>
>
> On Mon, Jun 11, 2012 at 6:56 AM, Hyrum K Wright
> wrote:
>>
>> On Thu, Jun 7, 2012 at 5:09 AM, Vladimir Berezniker
>> wrote:
>> > Greetings,
>> >
>> > This patch signifies a point post which I can merge the existing logic
>> > on
On Mon, Jun 11, 2012 at 6:58 AM, Hyrum K Wright
wrote:
> On Mon, Jun 11, 2012 at 12:56 PM, Hyrum K Wright
> wrote:
> > On Thu, Jun 7, 2012 at 5:09 AM, Vladimir Berezniker
> wrote:
> >> Greetings,
> >>
> >> This patch signifies a point post which I can merge the existing logic
> on
> >> the
> >>
On Mon, Jun 11, 2012 at 6:56 AM, Hyrum K Wright
wrote:
> On Thu, Jun 7, 2012 at 5:09 AM, Vladimir Berezniker
> wrote:
> > Greetings,
> >
> > This patch signifies a point post which I can merge the existing logic on
> > the
> > javahl-ra branch with starting parts of my proposed enhancements. So I
On 06/09/2012 05:09 PM, Stefan Küng wrote:
Hi,
here's another one from the crash reports sent for TSVN:
When doing an 'svn st -u' there's a crash happening in
svn_relpath_join(). Stacktrace attached.
in status.c:1579, make_file_baton() there's this:
f->repos_relpath = svn_relpath_join(find
On Mon, Jun 11, 2012 at 2:13 PM, Philip Martin
wrote:
> Hyrum K Wright writes:
>
>> Julian,
>> I'm seeing the following XPASSs on trunk:
>> At least one test XPASSED, checking /Users/Hyrum/dev/svn-trunk2/tests.log
>> XPASS: merge_symmetric_tests.py 7: merge_to_and_fro_1_1
>> XPASS: merge_symmetri
On Mon, Jun 11, 2012 at 6:20 AM, Hyrum K Wright
wrote:
> On Thu, Jun 7, 2012 at 4:03 AM, Vladimir Berezniker
> wrote:
> > Hi All,
> >
> > The intention if this patch is to introduce reusable logic for creating
> java
> > objects from within C++. This keeps object creation logic fully within
> C+
Hi,
See attached a patch to fix issue #4128: If the incoming file is identical to
the existing, locally modified file, we don't flag a conflict any more, but
notify the user of a successful merge.
[[[
libsvn_wc: no conflict for identical files
[ insubversion/libsvn_wc ]
* merge.c
(merge_fil
Hyrum K Wright writes:
> Julian,
> I'm seeing the following XPASSs on trunk:
> At least one test XPASSED, checking /Users/Hyrum/dev/svn-trunk2/tests.log
> XPASS: merge_symmetric_tests.py 7: merge_to_and_fro_1_1
> XPASS: merge_symmetric_tests.py 8: merge_to_and_fro_1_2
> XPASS: merge_symmetric_tes
On Sun, Jun 10, 2012 at 8:51 AM, Carlos Andrade wrote:
> Hi,
>
> I was interested on learning more about the mechanisms used on svn to verify
> if a certain code has been modified or not and how the merge function works.
> Is there any non-code documentation available for this? I would also be
> i
Julian,
I'm seeing the following XPASSs on trunk:
At least one test XPASSED, checking /Users/Hyrum/dev/svn-trunk2/tests.log
XPASS: merge_symmetric_tests.py 7: merge_to_and_fro_1_1
XPASS: merge_symmetric_tests.py 8: merge_to_and_fro_1_2
XPASS: merge_symmetric_tests.py 9: merge_to_and_fro_2_1
XPASS:
/home/neels/svnbench/20120611-102140
Started at Mon Jun 11 10:21:40 UTC 2012
*Disclaimer:* this tests only file://-URL access on a GNU/Linux VM.
This is intended to measure changes in performance of the local working
copy layer, *only*. These results are *not* generally true for everyone
On Mon, Jun 11, 2012 at 12:56 PM, Hyrum K Wright
wrote:
> On Thu, Jun 7, 2012 at 5:09 AM, Vladimir Berezniker
> wrote:
>> Greetings,
>>
>> This patch signifies a point post which I can merge the existing logic on
>> the
>> javahl-ra branch with starting parts of my proposed enhancements. So I ho
On Thu, Jun 7, 2012 at 5:09 AM, Vladimir Berezniker wrote:
> Greetings,
>
> This patch signifies a point post which I can merge the existing logic on
> the
> javahl-ra branch with starting parts of my proposed enhancements. So I hope
> people still have some patience left to review them.
>
> This
On 06/10/2012 09:28 AM, Justin Erenkrantz wrote:
> On Friday, June 8, 2012, C. Michael Pilato wrote:
>
> On 06/08/2012 03:15 PM, Ivan Zhakov wrote:
> > Wow, but performance will be much more interesting if we inline
> > properties to REPORT response. Mike, could you please share your
>
On Thu, Jun 7, 2012 at 4:03 AM, Vladimir Berezniker wrote:
> Hi All,
>
> The intention if this patch is to introduce reusable logic for creating java
> objects from within C++. This keeps object creation logic fully within C++
> while leaving to java the decision as to when they will be destroyed
I am not against server-side changes - but, I want to have evidence backing
up that Depth 1 (which should work on older servers) is significantly
slower than modifying the report. If we do get all props with the REPORT
response, we are going to have to do tricks on the client side as we can't
proc
Greg,
As soon as I do the merge, this will fix the last test failure on the
ev2-export branch. It looks like we've got a solid commit editor
driving Ev2.
My next target, hopefully for this week, is to implement replay using
Ev2. Since this is about reading data, and is mainly server-side, I
plan
On Mon, Jun 11, 2012 at 11:33 AM, wrote:
> Author: ivan
> Date: Mon Jun 11 09:33:36 2012
> New Revision: 1348770
>
> URL: http://svn.apache.org/viewvc?rev=1348770&view=rev
> Log:
> Fix compiler warning.
>
> * subversion/libsvn_subr/pool.c
> (abort_on_pool_failure): Add return statement to make c
On Sun, Jun 10, 2012 at 9:19 AM, Justin Erenkrantz
wrote:
> On Friday, June 8, 2012, C. Michael Pilato wrote:
>>
>> On 06/08/2012 03:15 PM, Ivan Zhakov wrote:
>> > Wow, but performance will be much more interesting if we inline
>> > properties to REPORT response. Mike, could you please share your
41 matches
Mail list logo
