Re: [PATCH] Fix issue #3686 - executable bit not set during merge

2011-02-11 Thread Daniel Becroft
On Sat, Feb 12, 2011 at 7:31 AM, Daniel Shahaf wrote: > Daniel Becroft wrote on Sat, Feb 12, 2011 at 06:27:31 +1000: > > On Fri, Feb 11, 2011 at 11:26 PM, Daniel Shahaf >wrote: > > > Daniel Becroft wrote on Thu, Feb 10, 2011 at 07:21:30 +1000: > > > > @@ -1118,6 +1120,33 @@ merge_binary_file(svn

Re: [PATCH] Fix issue #3686 - executable bit not set during merge

2011-02-11 Thread Daniel Shahaf
Daniel Becroft wrote on Sat, Feb 12, 2011 at 06:27:31 +1000: > On Fri, Feb 11, 2011 at 11:26 PM, Daniel Shahaf > wrote: > > Daniel Becroft wrote on Thu, Feb 10, 2011 at 07:21:30 +1000: > > > @@ -1118,6 +1120,33 @@ merge_binary_file(svn_skel_t **work_items, > > > + /* Attempt to merge the binary f

Re: What is a "baton" from subversion sources?

2011-02-11 Thread Hyrum K Wright
2011/2/11 Branko Čibej : > On 11.02.2011 21:37, Daniel Becroft wrote: >> On Sat, Feb 12, 2011 at 6:07 AM, Grigory Petrov wrote: >> >>> Hello. >>> >>> I'm learning subversion API right now and examining it's source code and >>> examples. It's a lot of things in subversion source code that is called

Re: What is a "baton" from subversion sources?

2011-02-11 Thread Branko Čibej
On 11.02.2011 21:37, Daniel Becroft wrote: > On Sat, Feb 12, 2011 at 6:07 AM, Grigory Petrov wrote: > >> Hello. >> >> I'm learning subversion API right now and examining it's source code and >> examples. It's a lot of things in subversion source code that is called a >> "baton". For example, svn_cm

Re: What is a "baton" from subversion sources?

2011-02-11 Thread Daniel Becroft
On Sat, Feb 12, 2011 at 6:07 AM, Grigory Petrov wrote: > Hello. > > I'm learning subversion API right now and examining it's source code and > examples. It's a lot of things in subversion source code that is called a > "baton". For example, svn_cmdline_create_auth_baton() create "auth baton", > an

cat_tests.py 5 failing because of double-escaped path in expected error message

2011-02-11 Thread Johan Corveleyn
Hi, Currently (trunk@1068411), cat_tests.py 5 (cat should skip uncattable resources) is failing on my machine (Windows XP). There seems to be some double-escaping of the path in the expected error message. I don't understand why this only happens on my machine, and not for instance on the Windows

Re: [PATCH] Fix issue #3686 - executable bit not set during merge

2011-02-11 Thread Daniel Becroft
On Fri, Feb 11, 2011 at 11:26 PM, Daniel Shahaf wrote: > [ disclaimer: I'm not familiar with wc internals yet; sorry; hope I'll > learn something while reviewing this ] > > Daniel Becroft wrote on Thu, Feb 10, 2011 at 07:21:30 +1000: > > > > > Hey Stefan, > > > > It was only partially bypassing

Re: What is a "baton" from subversion sources?

2011-02-11 Thread Mark Phippard
On Fri, Feb 11, 2011 at 3:07 PM, Grigory Petrov wrote: > I'm learning subversion API right now and examining it's source code and > examples. It's a lot of things in subversion source code that is called a > "baton". For example, svn_cmdline_create_auth_baton() create "auth baton", > and callback

What is a "baton" from subversion sources?

2011-02-11 Thread Grigory Petrov
Hello. I'm learning subversion API right now and examining it's source code and examples. It's a lot of things in subversion source code that is called a "baton". For example, svn_cmdline_create_auth_baton() create "auth baton", and callbacks takes callback function pointer and, again, batons

RE: svn commit: r1068411 - /subversion/trunk/subversion/tests/cmdline/authz_tests.py

2011-02-11 Thread Kamesh Jayachandran
>> >>Bad idea to hard code so much of the specific message we're generating >> >>today; it's bound to change later. >> > >> >>(eg, the XML parsing thing would ideally go away at some point) >> > >> >>Just 'Access.*${mu_url}.*forbidden' is enough IMO. >> > >> > >> > Thanks We fixed this in r1068802

Re: libsvn_wc/merge.c:detranslate_wc_file EOL text conflicts

2011-02-11 Thread Philip Martin
Branko Čibej writes: > On 11.02.2011 19:38, Philip Martin wrote: >> Am I misunderstanding how the eol stuff works? I thought the repository >> always stored files with LF and the svn:eol-style determined how the >> client converted the file. > Line endings are only canonicalized to LF in the re

Re: libsvn_wc/merge.c:detranslate_wc_file EOL text conflicts

2011-02-11 Thread Branko Čibej
On 11.02.2011 19:38, Philip Martin wrote: > Philip Martin writes: > >> Philip Martin writes: >> >>> But does cause 3 FAILs in merge_tests.py: >>> FAIL: merge_tests.py 34: conflict markers should match the file's eol style >>> FAIL: merge_tests.py 35: handle eol-style propchange during merge >>>

Re: libsvn_wc/merge.c:detranslate_wc_file EOL text conflicts

2011-02-11 Thread Philip Martin
Philip Martin writes: > Philip Martin writes: > >> But does cause 3 FAILs in merge_tests.py: >> FAIL: merge_tests.py 34: conflict markers should match the file's eol style >> FAIL: merge_tests.py 35: handle eol-style propchange during merge >> FAIL: merge_tests.py 110: dav skelta mode can cau

Re: svn commit: r1068411 - /subversion/trunk/subversion/tests/cmdline/authz_tests.py

2011-02-11 Thread Daniel Shahaf
Hyrum K Wright wrote on Fri, Feb 11, 2011 at 18:09:14 +: > On Fri, Feb 11, 2011 at 5:59 PM, Kamesh Jayachandran > wrote: > >>kame...@apache.org wrote on Tue, Feb 08, 2011 at 14:25:06 -: > >>> +  expected_error_for_cat = "svn: E175013: Unable to connect to a > >>> repository"+ \ > >>> +   

Re: svn commit: r1068411 - /subversion/trunk/subversion/tests/cmdline/authz_tests.py

2011-02-11 Thread Hyrum K Wright
On Fri, Feb 11, 2011 at 5:59 PM, Kamesh Jayachandran wrote: >>kame...@apache.org wrote on Tue, Feb 08, 2011 at 14:25:06 -: >>> +  expected_error_for_cat = "svn: E175013: Unable to connect to a >>> repository"+ \ >>> +    " at URL '" + mu_url + "'\n" + \ >>> +   

RE: svn commit: r1068411 - /subversion/trunk/subversion/tests/cmdline/authz_tests.py

2011-02-11 Thread Kamesh Jayachandran
>kame...@apache.org wrote on Tue, Feb 08, 2011 at 14:25:06 -: >> + expected_error_for_cat = "svn: E175013: Unable to connect to a >> repository"+ \ >> +" at URL '" + mu_url + "'\n" + \ >> +"svn: E175013: Access to '/" + mu_repo_path + \

Re: libsvn_wc/merge.c:detranslate_wc_file EOL text conflicts

2011-02-11 Thread Philip Martin
Philip Martin writes: > But does cause 3 FAILs in merge_tests.py: > FAIL: merge_tests.py 34: conflict markers should match the file's eol style > FAIL: merge_tests.py 35: handle eol-style propchange during merge > FAIL: merge_tests.py 110: dav skelta mode can cause spurious conflicts 110 was

libsvn_wc/merge.c:detranslate_wc_file EOL text conflicts

2011-02-11 Thread Philip Martin
I've been looking at some spurious text conflicts during merge that are caused because we attempt to merge files with different line endings. The script at the end of this mail shows the problem, it's a very simple merge and it doesn't change the EOL style. The problem is detranslate_wc_file. It

Re: svn commit: r1068684 - in /subversion/branches/integrate-io-improvements: ./ subversion/include/ subversion/libsvn_diff/ subversion/libsvn_fs_fs/ subversion/libsvn_repos/ subversion/libsvn_subr/

2011-02-11 Thread Daniel Shahaf
stef...@apache.org wrote on Tue, Feb 08, 2011 at 23:37:32 -: > @@ -3788,33 +3810,21 @@ contents_identical_p(svn_boolean_t *iden I'll just paste the patched function: > /* Do a byte-for-byte comparison of FILE1 and FILE2. */ > static svn_error_t * > contents_identical_p(svn_boolean_t *identica

Re: svn commit: r1068651 - in /subversion/branches/integrate-compression-level: ./ subversion/include/ subversion/libsvn_delta/ subversion/libsvn_ra_svn/ subversion/svnserve/ subversion/tests/libsvn_d

2011-02-11 Thread Daniel Shahaf
I've read just the diff, not the patched source. Overall, +1, and a couple of minor nits below: stef...@apache.org wrote on Tue, Feb 08, 2011 at 22:41:32 -: > Author: stefan2 > Date: Tue Feb 8 22:41:31 2011 > New Revision: 1068651 > > URL: http://svn.apache.org/viewvc?rev=1068651&view=rev >

Re: svn commit: r1068477 - /subversion/trunk/tools/dev/svnraisetreeconflict/main.c

2011-02-11 Thread Hyrum K Wright
On Fri, Feb 11, 2011 at 3:27 PM, Daniel Shahaf wrote: > hwri...@apache.org wrote on Tue, Feb 08, 2011 at 16:59:54 -: >> Author: hwright >> Date: Tue Feb  8 16:59:54 2011 >> New Revision: 1068477 >> >> URL: http://svn.apache.org/viewvc?rev=1068477&view=rev >> Log: >> * tools/dev/svnraisetreecon

Re: svn commit: r1068477 - /subversion/trunk/tools/dev/svnraisetreeconflict/main.c

2011-02-11 Thread Daniel Shahaf
hwri...@apache.org wrote on Tue, Feb 08, 2011 at 16:59:54 -: > Author: hwright > Date: Tue Feb 8 16:59:54 2011 > New Revision: 1068477 > > URL: http://svn.apache.org/viewvc?rev=1068477&view=rev > Log: > * tools/dev/svnraisetreeconflict/main.c > (raise_tree_conflict): Use the correct int typ

Re: svn commit: r1068411 - /subversion/trunk/subversion/tests/cmdline/authz_tests.py

2011-02-11 Thread Daniel Shahaf
kame...@apache.org wrote on Tue, Feb 08, 2011 at 14:25:06 -: > + expected_error_for_cat = "svn: E175013: Unable to connect to a > repository"+ \ > +" at URL '" + mu_url + "'\n" + \ > +"svn: E175013: Access to '/" + mu_repo_path + \ > +

Re: svn commit: r1068249 - in /subversion/trunk/subversion: libsvn_fs_util/caching.c libsvn_subr/cache-membuffer.c

2011-02-11 Thread Daniel Shahaf
stef...@apache.org wrote on Tue, Feb 08, 2011 at 02:08:41 -: > @@ -111,16 +113,49 @@ svn_fs__get_global_membuffer_cache(void) > + /* don't terminate upon OOM but make pool return a NULL pointer > + * instead so we can disable caching gracefully and continue > + * operation with

HEAD svnserve broken with 1.6 client

2011-02-11 Thread Philip Martin
The HEAD svnserve crashes when used with a 1.6 client: svnadmin create repo printf "[global]\nanon-access=write\n" > repo/conf/svnserve.conf svn mkdir -mm file://`pwd`/repo/A svnserve -dr. # 1.7 server svn cp -mm svn://localhost/repo/A svn://localhost/re

Re: [PATCH] Fix for Issue #3781 (Case Sensitive Authz)

2011-02-11 Thread Kamesh Jayachandran
On 02/11/2011 07:49 PM, Arwin Arni wrote: On Friday 11 February 2011 07:06 PM, Kamesh Jayachandran wrote: Thanks Arwin. Committed at r1069791. With regards Kamesh Jayachandran Here is the follow-up patch that fixes the deprecated calls of svn_config_read. Regards, Arwin Arni Thanks Arwi

Re: [PATCH] Fix for Issue #3781 (Case Sensitive Authz)

2011-02-11 Thread Arwin Arni
On Friday 11 February 2011 07:06 PM, Kamesh Jayachandran wrote: Thanks Arwin. Committed at r1069791. With regards Kamesh Jayachandran Here is the follow-up patch that fixes the deprecated calls of svn_config_read. Regards, Arwin Arni Index: subversion/libsvn_subr/config.c

Re: Partially recursive revert when node kind changes

2011-02-11 Thread Daniel Shahaf
Philip Martin wrote on Thu, Feb 10, 2011 at 18:44:54 +: > Bob Archer writes: > > >> Suppose I have a directory tree: > >> > >> foo/ > >> bar/ > >> zig > >> > >> and I delete the tree foo/bar and replace it by a file foo/bar. > >> What > >> should "svn revert --depth=files foo

Re: Partially recursive revert when node kind changes

2011-02-11 Thread Daniel Shahaf
Branko Čibej wrote on Thu, Feb 10, 2011 at 17:47:04 +0100: > On 10.02.2011 17:43, C. Michael Pilato wrote: > > On 02/10/2011 11:28 AM, Philip Martin wrote: > >> Suppose I have a directory tree: > >> > >> foo/ > >> bar/ > >> zig > >> > >> and I delete the tree foo/bar and replace it b

Re: svn commit: r1069602 - /subversion/trunk/subversion/libsvn_wc/wc_db.c

2011-02-11 Thread Hyrum K Wright
On Fri, Feb 11, 2011 at 8:18 AM, Bert Huijben wrote: > > >> -Original Message- >> From: hwri...@apache.org [mailto:hwri...@apache.org] >> Sent: donderdag 10 februari 2011 23:56 >> To: comm...@subversion.apache.org >> Subject: svn commit: r1069602 - >> /subversion/trunk/subversion/libsvn_wc

Re: [PATCH] Fix for Issue #3781 (Case Sensitive Authz)

2011-02-11 Thread Kamesh Jayachandran
On 02/10/2011 01:15 PM, Arwin Arni wrote: On Thursday 10 February 2011 12:48 PM, Arwin Arni wrote: On Wednesday 09 February 2011 09:21 PM, Arwin Arni wrote: Hi All, Here's the patch for the implementation of the logic. Regards, Arwin Arni Sorry, Please ignore the previous patch. There was a

Re: [PATCH] Fix issue #3686 - executable bit not set during merge

2011-02-11 Thread Daniel Shahaf
[ disclaimer: I'm not familiar with wc internals yet; sorry; hope I'll learn something while reviewing this ] Daniel Becroft wrote on Thu, Feb 10, 2011 at 07:21:30 +1000: > > > Hey Stefan, > > It was only partially bypassing the work queue. The items to update the > executable bit (and read/write

Re: svn commit: r1069743 - /subversion/trunk/subversion/libsvn_subr/svn_string.c

2011-02-11 Thread Philip Martin
Julian Foad writes: > On Fri, 2011-02-11, i...@apache.org wrote: >> URL: http://svn.apache.org/viewvc?rev=1069743&view=rev >> Log: >> Optimize svn_string_t creation by allocating memory for svn_string_t >> structure and data in one chunk. >> >> * subversion/libsvn_subr/svn_string.c >> (svn_st

Re: svn commit: r1069743 - /subversion/trunk/subversion/libsvn_subr/svn_string.c

2011-02-11 Thread Julian Foad
On Fri, 2011-02-11, i...@apache.org wrote: > URL: http://svn.apache.org/viewvc?rev=1069743&view=rev > Log: > Optimize svn_string_t creation by allocating memory for svn_string_t > structure and data in one chunk. > > * subversion/libsvn_subr/svn_string.c > (svn_string_ncreate): Allocate memory

Re: What should this tree conflict test expect? (was: svn commit: r879162)

2011-02-11 Thread Julian Foad
On Thu, 2011-02-10 at 12:10 -0500, Paul Burba wrote: > Hi Neels (or any other tree conflict gurus), > > I know you don't have much time for Subversion these days, but if you > find some time in the near future could you take a look at the tests > you added in r879162 and combined in r879206 (this

Re: Beehaviour change between 1.6 and 1.7 when reverting copies

2011-02-11 Thread Julian Foad
On Fri, 2011-02-11, Philip Martin wrote: > Julian Foad writes: > > > On Thu, 2011-02-10, Philip Martin wrote: > >> There has been a behaviour change reverting copied directories between > >> 1.6 and the current 1.7. > >> > >> In 1.7 the depth of the revert must match the depth of the copy, so if

Re: Integrating further changes from the performance branch

2011-02-11 Thread Johan Corveleyn
On Fri, Feb 11, 2011 at 11:10 AM, Ivan Zhakov wrote: > On Fri, Feb 11, 2011 at 03:51, Stefan Fuhrmann wrote: >> On 10.02.2011 22:15, Ivan Zhakov wrote: >>> >>> On Thu, Feb 10, 2011 at 03:25, Stefan Fuhrmann >>>  wrote: Hi there, Those among you following the commits will have

Re: Beehaviour change between 1.6 and 1.7 when reverting copies

2011-02-11 Thread Philip Martin
Julian Foad writes: > On Thu, 2011-02-10, Philip Martin wrote: >> There has been a behaviour change reverting copied directories between >> 1.6 and the current 1.7. >> >> In 1.7 the depth of the revert must match the depth of the copy, so if >> the directory only has files it can be reverted usi

Re: Integrating further changes from the performance branch

2011-02-11 Thread Ivan Zhakov
On Fri, Feb 11, 2011 at 03:51, Stefan Fuhrmann wrote: > On 10.02.2011 22:15, Ivan Zhakov wrote: >> >> On Thu, Feb 10, 2011 at 03:25, Stefan Fuhrmann >>  wrote: >>> >>> Hi there, >>> >>> Those among you following the commits will have noticed >>> that I opened 5 new branches each containing a cher

Re: Beehaviour change between 1.6 and 1.7 when reverting copies

2011-02-11 Thread Julian Foad
On Thu, 2011-02-10, Philip Martin wrote: > There has been a behaviour change reverting copied directories between > 1.6 and the current 1.7. > > In 1.7 the depth of the revert must match the depth of the copy, so if > the directory only has files it can be reverted using depth=files, if > the dire

RE: svn commit: r1069602 - /subversion/trunk/subversion/libsvn_wc/wc_db.c

2011-02-11 Thread Bert Huijben
> -Original Message- > From: hwri...@apache.org [mailto:hwri...@apache.org] > Sent: donderdag 10 februari 2011 23:56 > To: comm...@subversion.apache.org > Subject: svn commit: r1069602 - > /subversion/trunk/subversion/libsvn_wc/wc_db.c > > Author: hwright > Date: Thu Feb 10 22:56:11 2011