Re: svn merge - repeat merge is not a no-op

2010-02-09 Thread Paul Burba
On Tue, Jan 26, 2010 at 6:01 PM, Paul Burba wrote: > On Mon, Jan 25, 2010 at 12:45 PM, Paul Burba wrote: >> On Mon, Jan 25, 2010 at 9:32 AM, Julian Foad >> wrote: >>> After merging all changes from a branch into the WC, a second attempt of >>> the same merge brings in a different file. >>> >>>

Re: Incubator PMC/Board report for February 2010 ("Subversion Developers" )

2010-02-09 Thread Greg Stein
On Tue, Feb 9, 2010 at 21:34, Hyrum K. Wright wrote: > > On Feb 2, 2010, at 11:14 AM, Greg Stein wrote: > >> On Tue, Feb 2, 2010 at 13:01, Justin Erenkrantz >> wrote: >>> On Tue, Feb 2, 2010 at 9:54 AM, Bert Huijben wrote: Should we hold the graduation process on the javahl api changes, or

Re: JavaHL package name? (was: Discussion: graduating Subversion)

2010-02-09 Thread Hyrum K. Wright
On Jan 27, 2010, at 2:18 PM, Hyrum K. Wright wrote: > > On Jan 26, 2010, at 2:08 PM, Martin Furter wrote: > >> >> >> On Mon, 25 Jan 2010, Justin Erenkrantz wrote: >> >>> My take is deprecate the old package names (org.tigris.*), add the new >>> package name (org.apache.subversion.*), and rem

Re: Incubator PMC/Board report for February 2010 ("Subversion Developers" )

2010-02-09 Thread Hyrum K. Wright
On Feb 2, 2010, at 11:14 AM, Greg Stein wrote: > On Tue, Feb 2, 2010 at 13:01, Justin Erenkrantz wrote: >> On Tue, Feb 2, 2010 at 9:54 AM, Bert Huijben wrote: >>> Should we hold the graduation process on the javahl api changes, or can we >>> just continue that? >>> >>> I would guess that we sh

Re: [RFC] v2 Tree conflict resolver spec.

2010-02-09 Thread Neels J Hofmeyr
I sincerely apologize for the bugginess of my mail client. >:( ~Neels Neels J Hofmeyr wrote: >> Just a few comments from me on the first half of Neels' response to thi= > s >> draft. >> =20 >> Neels J Hofmeyr wrote: >>> Daniel N=C3=A4slund wrote: Design spec for tree conflict resolution in t

Re: [RFC] v2 Tree conflict resolver spec.

2010-02-09 Thread Neels J Hofmeyr
Julian Foad wrote: > Yup. And with merge, --accept=mine should be identical to 'svn revert'. Hey, wait a minute. That's not true when there were local modifications before the merge. I see it like this: Merge tree-conflicts, when they are encountered, should change neither the checked-out nor the

Re: [RFC] v2 Tree conflict resolver spec.

2010-02-09 Thread Neels J Hofmeyr
> Just a few comments from me on the first half of Neels' response to thi= s > draft. >=20 > Neels J Hofmeyr wrote: >> Daniel N=C3=A4slund wrote: >>> Design spec for tree conflict resolution in the commandline client >>> ~~~ >>> >>> Th

Re: [PATCH]: add section links (was: new website & IRC bot)

2010-02-09 Thread Martin Furter
On Tue, 9 Feb 2010, Julian Foad wrote: On Tue, 2010-02-09, Martin Furter wrote: I've created a copy and applied that patch-template: http://svn-test.borg.ch/ Mmm, nice :) Here's an attempt at a patch... Thanks! Please tell me you did that with a script, not by hand. You might want to enha

Re: [PATCH]: add section links (was: new website & IRC bot)

2010-02-09 Thread Julian Foad
On Tue, 2010-02-09, Martin Furter wrote: > I've created a copy and applied that patch-template: > http://svn-test.borg.ch/ > > Mmm, nice :) > > Here's an attempt at a patch... Thanks! Please tell me you did that with a script, not by hand. You might want to enhance your script to catch sections

Re: Re-use connection for svn:externals

2010-02-09 Thread Julian Foad
On Tue, 2010-02-09, Stefan Sperling wrote: > On Tue, Feb 09, 2010 at 08:19:07PM +0100, Bert Huijben wrote: > > > Van: Ivan Zhakov > > > The only problem I see is RA session root relative paths [1], since we > > > end up with pool of connection for one repository but with different > > > session roo

Re: CREATE TABLE WORK_QUEUE ... twice?

2010-02-09 Thread Julian Foad
Greg Stein wrote: > The first one is part of STMT_CREATE_SCHEMA, and the second is part of > STMT_UPGRADE_TO_13. Oh, good. Thanks for explaining. - Julian

Re: website getting subversion windows binaries

2010-02-09 Thread Роман Донченко
Mark Phippard писал в своём письме Tue, 09 Feb 2010 22:54:05 +0300: 2010/2/9 Роман Донченко : Mark Phippard писал в своём письме Tue, 09 Feb 2010 22:14:26 +0300: On Tue, Feb 9, 2010 at 2:10 PM, Justin Erenkrantz wrote: On Tue, Feb 9, 2010 at 10:38 AM, Mark Phippard wrote: I suppos

Re: Re-use connection for svn:externals

2010-02-09 Thread Phillip Hellewell
On Tue, Feb 9, 2010 at 10:09 AM, Julian Foad wrote: > > Would you, or anyone you know, be interested in working on it? I would > be glad to give you some help and guidance. > I don't have any experience with the subversion source code right now, but I'd be willing to become familiar with it if no

Re: Re-use connection for svn:externals

2010-02-09 Thread Ivan Zhakov
On Tue, Feb 9, 2010 at 9:19 PM, Bert Huijben wrote: > Opening at repository root reintroduces issue #3242 (Authorization fails at > repository root) > Sure, I'm aware about issue #3242. My proposal is to open RA session using some expected to be readable URL and then reparenting it to repository

RE: website getting subversion windows binaries

2010-02-09 Thread Bert Huijben
We have a builtin iconv for windows clients. And there is apr-iconv for most other cases like httpd. Bert - Oorspronkelijk bericht - Van: Роман Донченко Verzonden: dinsdag 9 februari 2010 20:49 Aan: dev@subversion.apache.org Onderwerp: Re: website getting subversion windows binaries M

Re: website getting subversion windows binaries

2010-02-09 Thread Mark Phippard
2010/2/9 Роман Донченко : > Mark Phippard писал в своём письме Tue, 09 Feb 2010 > 22:14:26 +0300: > >> On Tue, Feb 9, 2010 at 2:10 PM, Justin Erenkrantz >> wrote: >>> >>> On Tue, Feb 9, 2010 at 10:38 AM, Mark Phippard >>> wrote: I suppose we could try to use ASF hardware to assist a vo

Re: website getting subversion windows binaries

2010-02-09 Thread Роман Донченко
Mark Phippard писал в своём письме Tue, 09 Feb 2010 22:14:26 +0300: On Tue, Feb 9, 2010 at 2:10 PM, Justin Erenkrantz wrote: On Tue, Feb 9, 2010 at 10:38 AM, Mark Phippard wrote: I suppose we could try to use ASF hardware to assist a volunteer that wants to build Windows binaries, but A

Re: Re-use connection for svn:externals

2010-02-09 Thread Stefan Sperling
On Tue, Feb 09, 2010 at 08:19:07PM +0100, Bert Huijben wrote: > > Van: Ivan Zhakov > > The only problem I see is RA session root relative paths [1], since we > > end up with pool of connection for one repository but with different > > session root. We may workaround it using convention that svn_cli

RE: Re-use connection for svn:externals

2010-02-09 Thread Bert Huijben
Opening at repository root reintroduces issue #3242 (Authorization fails at repository root) Bert - Oorspronkelijk bericht - Van: Ivan Zhakov Verzonden: dinsdag 9 februari 2010 18:59 Aan: C. Michael Pilato CC: Julian Foad ; Phillip Hellewell ; dev@subversion.apache.org Onderwerp: Re:

Re: website getting subversion windows binaries

2010-02-09 Thread Mark Phippard
On Tue, Feb 9, 2010 at 2:10 PM, Justin Erenkrantz wrote: > On Tue, Feb 9, 2010 at 10:38 AM, Mark Phippard wrote: >> I suppose we could try to use ASF hardware to assist a volunteer that >> wants to build Windows binaries, but AFAIK, the position of the >> project has not changed about our desire

Re: website getting subversion windows binaries

2010-02-09 Thread Justin Erenkrantz
On Tue, Feb 9, 2010 at 10:38 AM, Mark Phippard wrote: > I suppose we could try to use ASF hardware to assist a volunteer that > wants to build Windows binaries, but AFAIK, the position of the > project has not changed about our desire to take any kind of ownership > of said binaries.  Also, assumi

Re: CREATE TABLE WORK_QUEUE ... twice?

2010-02-09 Thread Greg Stein
The first one is part of STMT_CREATE_SCHEMA, and the second is part of STMT_UPGRADE_TO_13. On Tue, Feb 9, 2010 at 12:42, Julian Foad wrote: > subversion/libsvn_wc/wc-metadata.sql contains CREATE TABLE WORK_QUEUE > (...) twice, the same each time. Intentional? > > Here is that section of the file

Re: [PATCH] fsfs: pack revs without packing revprops, or vice-versa

2010-02-09 Thread Daniel Shahaf
Julian Foad wrote on Tue, 9 Feb 2010 at 17:01 -: > Daniel Shahaf wrote: > > Since the fsfs logics of rev-packing and revprop-packing are entirely > > separate (e.g., min-unpacked-rev and min-unpacked-revprop are separate), > > one could reasonably want to enable one without enabling the other

Re: website getting subversion windows binaries

2010-02-09 Thread Mark Phippard
On Tue, Feb 9, 2010 at 1:26 PM, wrote: > justin.erenkra...@gmail.com wrote on 02/09/2010 12:11:04 PM: >> On Tue, Feb 9, 2010 at 8:05 AM,   wrote: >> > news wrote on 02/09/2010 01:02:52 AM: >> >> >> >> 'getting subversion' still lists the 'tigris.org' windows binaries >> >> that were provided by

Re: website getting subversion windows binaries

2010-02-09 Thread kmradke
justin.erenkra...@gmail.com wrote on 02/09/2010 12:11:04 PM: > On Tue, Feb 9, 2010 at 8:05 AM, wrote: > > news wrote on 02/09/2010 01:02:52 AM: > >> > >> 'getting subversion' still lists the 'tigris.org' windows binaries > >> that were provided by D.J. Heap. > >> But they are stuck at 1.6.6 and

Re: '@BASE' vs. 'BASE tree' -- was: Re: svn_wc__db_base_get_info() vs. svn_wc__db_read_info() ?

2010-02-09 Thread Julian Foad
On Thu, 2010-01-28, Greg Stein wrote: > On Thu, Jan 28, 2010 at 12:30, Julian Foad wrote: [...] > > The big conceptual difference between your wc_db trees and what I think > > the user's concept of trees should be, is that the wc_db trees are > > "overlays", whereas the user's notions of "base" an

Re: website getting subversion windows binaries

2010-02-09 Thread Justin Erenkrantz
On Tue, Feb 9, 2010 at 8:05 AM, wrote: > news wrote on 02/09/2010 01:02:52 AM: >> >> 'getting subversion' still lists the 'tigris.org' windows binaries >> that were provided by D.J. Heap. >> But they are stuck at 1.6.6 and as D.J. stated in >> >> http://subversion.tigris.org/ds/viewMessage.do? >

Re: new website & IRC bot

2010-02-09 Thread Justin Erenkrantz
On Mon, Feb 8, 2010 at 2:12 PM, C. Michael Pilato wrote: >> (By the way: last I checked, the entire text of the CG was duplicated >> across the index.html + the individual files; we should fix this) > > We haven't decided to keep the fragmented version of the CG yet.  What's > there was a bit of e

Re: Re-use connection for svn:externals

2010-02-09 Thread Ivan Zhakov
On Tue, Feb 9, 2010 at 7:51 PM, C. Michael Pilato wrote: > Ivan Zhakov wrote: >> On Tue, Feb 9, 2010 at 7:09 PM, Julian Foad wrote: >>> There are several places where the client should/could re-use a >>> connection. During a multi-target update command like "svn up a b c" is >>> another example.

Re: Re-use connection for svn:externals

2010-02-09 Thread C. Michael Pilato
Ivan Zhakov wrote: > On Tue, Feb 9, 2010 at 7:09 PM, Julian Foad wrote: >> There are several places where the client should/could re-use a >> connection. During a multi-target update command like "svn up a b c" is >> another example. >> >> Would you, or anyone you know, be interested in working on

Re: Re-use connection for svn:externals

2010-02-09 Thread Ivan Zhakov
On Tue, Feb 9, 2010 at 7:09 PM, Julian Foad wrote: > On Mon, 2010-02-08, Phillip Hellewell wrote: >> I'm not sure if this is related to issue 1448 or not (it's kinda like the >> opposite of 1448 actually), but I use externals extensively and doing an >> update is slow.  It appears to be creating a

CREATE TABLE WORK_QUEUE ... twice?

2010-02-09 Thread Julian Foad
subversion/libsvn_wc/wc-metadata.sql contains CREATE TABLE WORK_QUEUE (...) twice, the same each time. Intentional? Here is that section of the file in full: [[[ CREATE TABLE WORK_QUEUE ( /* Work items are identified by this value. */ id INTEGER PRIMARY KEY AUTOINCREMENT, /* A serialized

Re: Re-use connection for svn:externals

2010-02-09 Thread Julian Foad
On Mon, 2010-02-08, Phillip Hellewell wrote: > I'm not sure if this is related to issue 1448 or not (it's kinda like the > opposite of 1448 actually), but I use externals extensively and doing an > update is slow. It appears to be creating a new connection for each > external even though it's the

Re: [PATCH] fsfs: pack revs without packing revprops, or vice-versa

2010-02-09 Thread Julian Foad
Daniel Shahaf wrote: > Since the fsfs logics of rev-packing and revprop-packing are entirely > separate (e.g., min-unpacked-rev and min-unpacked-revprop are separate), > one could reasonably want to enable one without enabling the other. Why? As a developer, for testing etc., sure - but in real

Re: new website & IRC bot

2010-02-09 Thread Karen Tracey
On Tue, Feb 9, 2010 at 10:55 AM, Alan Barrett wrote: > On Tue, 09 Feb 2010, Julian Foad wrote: > > * A very neat solution: a little "link to this section" symbol after > > each heading. I saw a web site that provided links to the individual > > section headings by popping up a little symbol (the

Re: new website & IRC bot

2010-02-09 Thread Mark Phippard
On Mon, Feb 8, 2010 at 7:01 PM, Peter Samuelson wrote: > > [Mark Phippard] >> I am curious why you find them distracting.  Are you using a browser >> setting that makes them prominent?  I never even see them unless I >> hover my mouse for a while. > > You don't find it distracting when you move yo

Re: new website & IRC bot

2010-02-09 Thread Julian Foad
Alan Barrett wrote: > On Tue, 09 Feb 2010, Julian Foad wrote: > > * A very neat solution: a little "link to this section" symbol after > > each heading. I saw a web site that provided links to the individual > > section headings by popping up a little symbol (the paragraph marker > > symbol which l

Re: website getting subversion windows binaries

2010-02-09 Thread kmradke
news wrote on 02/09/2010 01:02:52 AM: > > 'getting subversion' still lists the 'tigris.org' windows binaries > that were provided by D.J. Heap. > But they are stuck at 1.6.6 and as D.J. stated in > > http://subversion.tigris.org/ds/viewMessage.do? > dsForumId=462&dsMessageId=2423180 > > he won'

Re: new website & IRC bot

2010-02-09 Thread Alan Barrett
On Tue, 09 Feb 2010, Julian Foad wrote: > * A very neat solution: a little "link to this section" symbol after > each heading. I saw a web site that provided links to the individual > section headings by popping up a little symbol (the paragraph marker > symbol which looks like a P with a double-st

Re: new website & IRC bot

2010-02-09 Thread Daniel Shahaf
Julian Foad wrote on Tue, 9 Feb 2010 at 13:43 -: > * A very neat solution: a little "link to this section" symbol after > each heading. I saw a web site that provided links to the individual > section headings by popping up a little symbol (the paragraph marker > symbol which looks like a P wit

Re: [RFC] v2 Tree conflict resolver spec.

2010-02-09 Thread Julian Foad
Just a few comments from me on the first half of Neels' response to this draft. Neels J Hofmeyr wrote: > Daniel Näslund wrote: > > Design spec for tree conflict resolution in the commandline client > > ~~~ > > > > The hard part is fi

[PATCH] fsfs: pack revs without packing revprops, or vice-versa

2010-02-09 Thread Daniel Shahaf
Since the fsfs logics of rev-packing and revprop-packing are entirely separate (e.g., min-unpacked-rev and min-unpacked-revprop are separate), one could reasonably want to enable one without enabling the other. The attached patch implements this. I took it for a spin: it seems to work as inten

Re: website getting subversion windows binaries

2010-02-09 Thread Geoff Rowell
On Tue, Feb 9, 2010 at 9:42 AM, Bert Huijben wrote: > On Tue, Feb 9, 2010 at 9:05 AM, Geoff Rowell wrote: >> On Tue, Feb 9, 2010 at 2:02 AM, Lorenz wrote: >>> Hi all, >>> >>> 'getting subversion' still lists the 'tigris.org' windows binaries >>> that were provided by D.J. Heap. >>> But they are

RE: website getting subversion windows binaries

2010-02-09 Thread Bert Huijben
It should be in the sliksvn client binaries. If not please let me know. Bert - Oorspronkelijk bericht - Van: Geoff Rowell Verzonden: dinsdag 9 februari 2010 15:05 Aan: Lorenz CC: dev@subversion.apache.org Onderwerp: Re: website getting subversion windows binaries On Tue, Feb 9, 2010 a

Re: [RFC] v2 Tree conflict resolver spec.

2010-02-09 Thread Neels J Hofmeyr
Hi Daniel, please don't be put off by the numerous comments and corrections (I lost count on how often I had to revise my concepts with the help of Julian, Stefan and Steve). It *is* pretty complex. And to err is productive. * neels pulls the red marker Daniel Näslund wrote: > On Sun, Feb 07, 20

Re: website getting subversion windows binaries

2010-02-09 Thread Geoff Rowell
On Tue, Feb 9, 2010 at 2:02 AM, Lorenz wrote: > Hi all, > > 'getting subversion' still lists the 'tigris.org' windows binaries > that were provided by D.J. Heap. > But they are stuck at 1.6.6 and as D.J. stated in > > http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2423180

Re: new website & IRC bot

2010-02-09 Thread Julian Foad
Alan Barrett wrote: > On Mon, 08 Feb 2010, Mark Phippard wrote: > > > I hoped these 'tooltips' disappear after the move, but they didn't... > > > They're so awfully distracting [...] > > Yes, they are horrid. > > > I am curious why you find them distracting. Are you using a browser > > setting t

Re: new website & IRC bot

2010-02-09 Thread Alan Barrett
On Mon, 08 Feb 2010, Mark Phippard wrote: > > I hoped these 'tooltips' disappear after the move, but they didn't... > > They're so awfully distracting [...] Yes, they are horrid. > I am curious why you find them distracting. Are you using a browser > setting that makes them prominent? I never e

Re: new website & IRC bot

2010-02-09 Thread Neels J Hofmeyr
Peter Samuelson wrote: > [Mark Phippard] >> I am curious why you find them distracting. Are you using a browser >> setting that makes them prominent? I never even see them unless I >> hover my mouse for a while. > > You don't find it distracting when you move your mouse onto some > whitespace ou