httpd trunk broken with Subversion: ap_log_rerror busted

2010-08-24 Thread Justin Erenkrantz
In r951893, httpd modified a #define for APLOG_MARK to add in a new parameter called APLOG_MODULE_INDEX (in addition to file and line info). This busts Subversion - specifically, mod_authz_svn which has a function called: static void log_access_verdict(const char *file, int line,

Re: About character encoding of the text files

2010-08-24 Thread B Smith-Mannschott
On Tue, Aug 24, 2010 at 21:19, Ivan Cenov wrote: > Hello, > > This is my first post in this list. I was pointed to post here in another > thread > ViewVC site (http://viewvc.tigris.org/issues/show_bug.cgi?id=11). > > The original reason was that ViewVC is unable to show correctly text files > th

About character encoding of the text files

2010-08-24 Thread Ivan Cenov
Hello, This is my first post in this list. I was pointed to post here in another thread ViewVC site (http://viewvc.tigris.org/issues/show_bug.cgi?id=11). The original reason was that ViewVC is unable to show correctly text files that contain Cyrillic characters (character set windows-1251). (

Re: git diff format support

2010-08-24 Thread Stefan Sperling
On Tue, Aug 24, 2010 at 07:51:28PM +0300, anatoly techtonik wrote: > Good to know. Is it worth to rename it to `svn diff --git` for > unification with Mercurial? I suppose we could rename the option to "--git", yes. Do you want to send a patch that does so? See http://subversion.apache.org/docs/co

Re: git diff format support

2010-08-24 Thread Stefan Sperling
On Tue, Aug 24, 2010 at 05:44:50PM +0100, Jon Foster wrote: > Hi, > > There is a --git-diff option in Subversion Trunk, so this will > probably be available in Subversion 1.7. Yes. But there are some restrictions, most notably with renames. Our git-style diffs show adds, deletes, and copies prope

Re: RFC: How should Subversion handle OS-deleted paths?

2010-08-24 Thread Alan Barrett
On Tue, 24 Aug 2010, Julian Foad wrote: > the as-yet-unavailable "svn mv --retrospectively" command [1], Is this is just a special case of the as-yet-unavailable "--metadata-only" option, which would tell svn to adjust its metadata as if some operation were performed, but not to touch anything out

Re: git diff format support

2010-08-24 Thread anatoly techtonik
Good to know. Is it worth to rename it to `svn diff --git` for unification with Mercurial? Please, CC. On Tue, Aug 24, 2010 at 7:44 PM, Jon Foster wrote: > Hi, > > There is a --git-diff option in Subversion Trunk, so this will > probably be available in Subversion 1.7. > > Kind regards, > > Jon

RE: git diff format support

2010-08-24 Thread Jon Foster
Hi, There is a --git-diff option in Subversion Trunk, so this will probably be available in Subversion 1.7. Kind regards, Jon -Original Message- From: anatoly techtonik [mailto:techto...@gmail.com] Sent: 24 August 2010 17:35 To: Subversion Development Subject: git diff format support

git diff format support

2010-08-24 Thread anatoly techtonik
Hello again, I am struggling with "svn diff" output format, which doesn't contain information about added, copied and renamed files. This information is needed for generating complete code review diffs for Rietveld project. It would be nice if `svn diff` supported additional -g, --git option to ge

Re: Disable diff-cmd

2010-08-24 Thread anatoly techtonik
On Tue, Aug 24, 2010 at 3:48 PM, Philip Martin wrote: > >> Not really. In Rietveld project we call "svn diff" by upload.py script >> used to send diffs for review to remote server. We can't instruct >> users to copy config dir, so we need to do this automatically. That >> means copying the whole c

Re: svn commit: r988074 - in /subversion/trunk/subversion/tests/cmdline: svntest/wc.py upgrade_tests.py

2010-08-24 Thread Philip Martin
"Bert Huijben" writes: >> From: Philip Martin [mailto:philip.mar...@wandisco.com] >> Sent: dinsdag 24 augustus 2010 16:58 >> To: Bert Huijben >> Cc: 'Julian Foad'; 'Bert Huijben'; dev@subversion.apache.org >> Subject: Re: svn commit: r988074 - in >> /subversion/trunk/subversion/tests/cmdline: svn

Re: svn commit: r988550 - in /subversion/trunk/subversion: libsvn_wc/entries.c tests/cmdline/upgrade_tests.py

2010-08-24 Thread Philip Martin
"Bert Huijben" writes: >> -Original Message- >> From: phi...@apache.org [mailto:phi...@apache.org] >> Sent: dinsdag 24 augustus 2010 16:13 >> To: comm...@subversion.apache.org >> Subject: svn commit: r988550 - in /subversion/trunk/subversion: >> libsvn_wc/entries.c tests/cmdline/upgrade_t

RE: svn commit: r988074 - in /subversion/trunk/subversion/tests/cmdline: svntest/wc.py upgrade_tests.py

2010-08-24 Thread Bert Huijben
> -Original Message- > From: Philip Martin [mailto:philip.mar...@wandisco.com] > Sent: dinsdag 24 augustus 2010 16:58 > To: Bert Huijben > Cc: 'Julian Foad'; 'Bert Huijben'; dev@subversion.apache.org > Subject: Re: svn commit: r988074 - in > /subversion/trunk/subversion/tests/cmdline: svn

RE: svn commit: r988550 - in /subversion/trunk/subversion: libsvn_wc/entries.c tests/cmdline/upgrade_tests.py

2010-08-24 Thread Bert Huijben
> -Original Message- > From: phi...@apache.org [mailto:phi...@apache.org] > Sent: dinsdag 24 augustus 2010 16:13 > To: comm...@subversion.apache.org > Subject: svn commit: r988550 - in /subversion/trunk/subversion: > libsvn_wc/entries.c tests/cmdline/upgrade_tests.py > > Author: philip >

Re: svn commit: r988074 - in /subversion/trunk/subversion/tests/cmdline: svntest/wc.py upgrade_tests.py

2010-08-24 Thread Philip Martin
"Bert Huijben" writes: >> -Original Message- >> From: Julian Foad [mailto:julian.f...@wandisco.com] >> >> If, instead, we construct each the PRISTINE table entry at the point >> where we're converting an entry from the entries file, then we can >> calculate both checksums on the fly, and

Re: Commiting, tree conflicts and keep-local

2010-08-24 Thread Julian Foad
I'm looking at the tree_conflict_tests.py 17 failure in single-DB. FAIL: tree_conflict_tests.py 17: --keep-local del on dir with TCs inside Neels, you might be able to shed some light on this. What's the test for? The test says: if you have a directory with tree conflict

Re: Disable diff-cmd

2010-08-24 Thread Stefan Sperling
On Tue, Aug 24, 2010 at 01:48:43PM +0100, Julian Foad wrote: > anatoly techtonik wrote: > > On Tue, Aug 24, 2010 at 2:29 PM, Stefan Sperling wrote: > > >> > > > >> > --internal-diff seems to be new in 1.7 so i guess the only option is > > >> > using > > >> > --config-dir to override it. > > >> >

Re: Disable diff-cmd

2010-08-24 Thread Philip Martin
Philip Martin writes: > anatoly techtonik writes: > >> Not really. In Rietveld project we call "svn diff" by upload.py script >> used to send diffs for review to remote server. We can't instruct >> users to copy config dir, so we need to do this automatically. That >> means copying the whole con

Re: Disable diff-cmd

2010-08-24 Thread Julian Foad
anatoly techtonik wrote: > On Tue, Aug 24, 2010 at 2:29 PM, Stefan Sperling wrote: > >> > > >> > --internal-diff seems to be new in 1.7 so i guess the only option is > >> > using > >> > --config-dir to override it. > >> > >> Why not to stop proliferation of options by allowing an empty value > >>

Re: Disable diff-cmd

2010-08-24 Thread Philip Martin
anatoly techtonik writes: > Not really. In Rietveld project we call "svn diff" by upload.py script > used to send diffs for review to remote server. We can't instruct > users to copy config dir, so we need to do this automatically. That > means copying the whole config dir and comment only one op

Re: Disable diff-cmd

2010-08-24 Thread anatoly techtonik
On Tue, Aug 24, 2010 at 2:29 PM, Stefan Sperling wrote: >> > >> > --internal-diff seems to be new in 1.7 so i guess the only option is using >> > --config-dir to override it. >> >> Why not to stop proliferation of options by allowing an empty value >> for --diff-cmd to be treated as an instruction

RE: svn commit: r988074 - in /subversion/trunk/subversion/tests/cmdline: svntest/wc.py upgrade_tests.py

2010-08-24 Thread Bert Huijben
> -Original Message- > From: Julian Foad [mailto:julian.f...@wandisco.com] > Sent: dinsdag 24 augustus 2010 13:04 > To: Bert Huijben > Cc: 'Philip Martin'; dev@subversion.apache.org > Subject: RE: svn commit: r988074 - in > /subversion/trunk/subversion/tests/cmdline: svntest/wc.py > upgra

Re: Disable diff-cmd

2010-08-24 Thread Stefan Sperling
On Tue, Aug 24, 2010 at 02:24:25PM +0300, anatoly techtonik wrote: > On Tue, Aug 24, 2010 at 11:35 AM, Martin Furter wrote: > > > > --internal-diff seems to be new in 1.7 so i guess the only option is using > > --config-dir to override it. > > Why not to stop proliferation of options by allowing

Re: RFC: How should Subversion handle OS-deleted paths?

2010-08-24 Thread Julian Foad
On Fri, 2010-08-20, Paul Burba wrote: > I think we can all agree that when a user deletes part of their WC via > the OS they have made a mistake of some sort. But which mistake > exactly? The obvious answer is that they really intended 'svn del > dirX/foo.c'. But possibly they intended somethin

Re: Disable diff-cmd

2010-08-24 Thread anatoly techtonik
On Tue, Aug 24, 2010 at 11:35 AM, Martin Furter wrote: > > --internal-diff seems to be new in 1.7 so i guess the only option is using > --config-dir to override it. Why not to stop proliferation of options by allowing an empty value for --diff-cmd to be treated as an instructions to use internal

Re: error on compiling subversion with kwallet support

2010-08-24 Thread Philip Martin
shrinivasan writes: > I am compiling subversion with kwallet support. > But, Getting the following error. > > > ./configure --with-kwallet --prefix=/home/shrinivasan/svn-builds/1.6.13 > cd subversion/libsvn_auth_kwallet && /usr/share/apr-1.0/build/libtool > --tag=CXX --silent --mode=link g++ -g

RE: svn commit: r988074 - in /subversion/trunk/subversion/tests/cmdline: svntest/wc.py upgrade_tests.py

2010-08-24 Thread Julian Foad
Bert Huijben wrote: > Philip Martin wrote: > > "Bert Huijben" writes: > > > > >> * subversion/tests/cmdline/upgrade_tests.py > > >> (text_base_path): Restore MD5 support removed in r960036. > > > > > > I think the real fix would be to upgrade to SHA1 (and add the > > > mapping in the pristines

Re: svn commit: r988074 - in /subversion/trunk/subversion/tests/cmdline: svntest/wc.py upgrade_tests.py

2010-08-24 Thread Philip Martin
"Bert Huijben" writes: > In the old entries format we only kept one checksum, while we can have two > pristine files, so just keeping it as MD5 can't solve all the issues. That's NODE_DATA, nothing to do with single-db. > But we can't just assume that we never see a collision with MD5 over an >

error on compiling subversion with kwallet support

2010-08-24 Thread shrinivasan
Hi, I am compiling subversion with kwallet support. But, Getting the following error. ./configure --with-kwallet --prefix=/home/shrinivasan/svn-builds/1.6.13 /usr/share/apr-1.0/build/libtool --tag=CXX --silent --mode=compile g++ -DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -DQT

Re: merging into locally added files

2010-08-24 Thread Stefan Sperling
On Tue, Aug 24, 2010 at 08:59:32AM +0100, Julian Foad wrote: > On Tue, 2010-08-24, Stefan Sperling wrote: > > On Mon, Aug 23, 2010 at 06:40:39PM +0100, Julian Foad wrote: > > > You seem to be talking only about the case where the (locally added) > > > target is the root of the whole merge, and sayi

RE: svn commit: r988074 - in /subversion/trunk/subversion/tests/cmdline: svntest/wc.py upgrade_tests.py

2010-08-24 Thread Bert Huijben
> -Original Message- > From: Philip Martin [mailto:philip.mar...@wandisco.com] > Sent: dinsdag 24 augustus 2010 10:40 > To: Bert Huijben > Cc: dev@subversion.apache.org > Subject: Re: svn commit: r988074 - in > /subversion/trunk/subversion/tests/cmdline: svntest/wc.py > upgrade_tests.py >

Re: svn diff optimization to make blame faster?

2010-08-24 Thread Philip Martin
Johan Corveleyn writes: > Ok, thanks. In the meantime I saw that there is not that much > difference anymore between GNU diff and svn_diff, after running the > latter from a release build, and disabling my anti-virus (which makes > me wonder why my anti-virus slows down svn_diff (impact when open

Re: svn commit: r988074 - in /subversion/trunk/subversion/tests/cmdline: svntest/wc.py upgrade_tests.py

2010-08-24 Thread Philip Martin
"Bert Huijben" writes: >> * subversion/tests/cmdline/upgrade_tests.py >> (text_base_path): Restore MD5 support removed in r960036. > > I think the real fix would be to upgrade to SHA1 (and add the > mapping in the pristines table) in the upgrade step. I expected that > this was already handled?

Re: Disable diff-cmd

2010-08-24 Thread Martin Furter
On Tue, 24 Aug 2010, anatoly techtonik wrote: Hello, Is there any way to disable "diff-cmd" setting for just one run of "svn diff"? I need it for code review upload script, which fails when users have configured graphical diff. Is there any way to force svn use internal diff implemantation? I

Re: Looking to improve performance of svn annotate

2010-08-24 Thread Johan Corveleyn
On Fri, Aug 20, 2010 at 9:11 PM, Johan Corveleyn wrote: > On Fri, Aug 20, 2010 at 1:40 PM, Johan Corveleyn wrote: >> After eliminating antivirus, and running with a release build instead >> of a debug build, svn diff is just about on par with GNU diff. So this >> eliminates the option of optimizi

Re: svn diff optimization to make blame faster?

2010-08-24 Thread Johan Corveleyn
On Sun, Aug 22, 2010 at 4:02 PM, Branko Čibej wrote: > On 18.08.2010 00:59, Johan Corveleyn wrote: >> Hi devs, >> >> While "Looking to improve performance of svn annotate" [1], I found >> that the current blame algorithm is mainly client-side bound, and that >> most of its time is spent on "svn di

Re: merging into locally added files

2010-08-24 Thread Julian Foad
On Tue, 2010-08-24, Stefan Sperling wrote: > On Mon, Aug 23, 2010 at 06:40:39PM +0100, Julian Foad wrote: > > You seem to be talking only about the case where the (locally added) > > target is the root of the whole merge, and saying that lack of ancestral > > relationship between the source node an