Re: nested copies broken on trunk

Philip Martin writes: > Stefan Sperling writes: > >> + svn cp nested-copy/trunk/gamma nested-copy/trunk/gamma.copied >> A nested-copy/trunk/gamma.copied >> + svn mv nested-copy/trunk/gamma.copied/delta >> nested-copy/trunk/gamma.copied/delta.copied >> A nested-copy/trunk

Re: FAQ Bug

C. Michael Pilato wrote: > Erik Karulf wrote: >> Hi All, >> >> I know you are in the process of moving things over from collab.net, but I >> wanted to point out a quick gotcha. >> >> The FAQ entry on HTTP methods points to: >> http://svn.collab.net/repos/svn/trunk/notes/webdav-protocol >> which in

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

On Thu, Jan 28, 2010 at 12:30, Julian Foad wrote: > Greg Stein wrote: >... >> I would also suggest new names for the trees since WORKING has caused >> us problems, too. >> >> PRISTINE might be okay. And something to reference a restructured tree >> (WORKING is all about add/copy/move/del). > > The

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

On Thu, Jan 28, 2010 at 21:25, Neels J Hofmeyr wrote: > Wait a minute, I just read this again: > > notes/wc-ng/design > [[[ >  * BASE: The tree of nodes from the repository, against which local changes >     are made.  Also known as "pristine".  Each node is as it was in the >     repository at a

Re: website link to HACKING

C. Michael Pilato wrote: > Neels J Hofmeyr wrote: >> Hi, >> >> a link on http://subversion.apache.org/roadmap.html is broken: >> >> [[[ >> in the >> Hacker's Guide to Subversion. >> ]]] > > Fixed. > >> Not sure where to post this, though. > > d...@subversion.tigris.org is dead. Post all stuff

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

Wait a minute, I just read this again: notes/wc-ng/design [[[ * BASE: The tree of nodes from the repository, against which local changes are made. Also known as "pristine". Each node is as it was in the repository at a particular revision and URL, as recorded per node in the WC m

Re: FAQ Bug

Erik Karulf wrote: > Hi All, > > I know you are in the process of moving things over from collab.net, but I > wanted to point out a quick gotcha. > > The FAQ entry on HTTP methods points to: > http://svn.collab.net/repos/svn/trunk/notes/webdav-protocol > which in turn gives a 404, helpfully sugge

FAQ Bug

Hi All, I know you are in the process of moving things over from collab.net, but I wanted to point out a quick gotcha. The FAQ entry on HTTP methods points to: http://svn.collab.net/repos/svn/trunk/notes/webdav-protocol which in turn gives a 404, helpfully suggesting to try: http://svn.apache.org

website link to HACKING

Hi, a link on http://subversion.apache.org/roadmap.html is broken: [[[ in the Hacker's Guide to Subversion. ]]] The link points at http://subversion.apache.org/hacking.html, which is, I gather, now called the Community Guide... Not sure where to post this, though. Can committers edit the new w

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

Julian Foad wrote: > On Thu, 2010-01-28 at 15:17 +0100, Neels J Hofmeyr wrote: >> Greg Stein wrote: >>> On Wed, Jan 27, 2010 at 16:51, Neels J Hofmeyr wrote: Greg Stein wrote: ... > and recall that BASE == what you checked out from the repository. > WORKING corresponds to added/r

Re: nested copies broken on trunk

Greg Stein writes: > the node functions are considered transient. It would be best to implement > something more direct against wc_db I'm not sure it's the right solution -- it might just be working round a bug. The problem only occurs when the deleted file is a direct child of a copied directo

Re: svn commit: r904301 - in /subversion/trunk: contrib/cgi/ contrib/client-side/emacs/ contrib/client-side/svnmerge/ contrib/hook-scripts/ contrib/server-side/ doc/user/ notes/ notes/http-and-webdav/

Note this commit, updating the repository URL. I quickly scanned over all the changes, but if anyone wants to keep the old repository URL around anywhere else than in CHANGES, feel free to revert this revision in those places. (as always) Patch by: sed -i ;) ~Neels ne...@apache.org wrote: > Aut

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

On Thu, Jan 28, 2010 at 12:59 PM, Hyrum K. Wright wrote: > > On Jan 28, 2010, at 12:26 PM, Daniel Rall wrote: > >> On Thu, Jan 28, 2010 at 12:20 PM, Mark Phippard wrote: ... >>> 3) Looks like you renamed SVNClient to Client.  I think I would prefer >>> the old name just because it can be a nuisan

Re: nested copies broken on trunk

the node functions are considered transient. It would be best to implement something more direct against wc_db On Jan 28, 2010 11:11 AM, "Philip Martin" wrote: Stefan Sperling writes: > + svn cp nested-copy/trunk/gamma nested-copy/trunk/gamm... workqueue.c:run_deletion_postcommit calls svn_wc_

Re: NOW can we remove the yellow warning on the website?

C. Michael Pilato wrote: > Philip Martin wrote: >> "C. Michael Pilato" writes: >> >>> I'd really like to move on from this website task. Yes, there are still >>> some TODO items on the pages. But are we ready to call our URL space stable >>> enough to allow folks to link to the pages? Can I beg

Re: [PATCH] v7 #3460

On Thu, Jan 28, 2010 at 10:35:50PM +0100, Stefan Sperling wrote: > > > Fixed, but with doubts. Passing only hi instead of (hi, n, fuzz) was > > > fine but only passing target made it harder to understand why the caller > > > calls copy_hunk(). But I've done it so I couldn't have been totally > > >

Re: [PATCH] v7 #3460

On Thu, Jan 28, 2010 at 07:28:59PM +0100, Stefan Sperling wrote: > On Thu, Jan 28, 2010 at 07:18:15PM +0100, Daniel Näslund wrote: > > On Thu, Jan 28, 2010 at 06:29:41PM +0100, Stefan Sperling wrote: > > > We could rename it to emit_hunk(), flush_hunk(), hunk_done(), or something > > > similar, sig

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

On Thu, Jan 28, 2010 at 12:20 PM, Mark Phippard wrote: > On Wed, Jan 27, 2010 at 5:18 PM, Hyrum K. Wright > wrote: > >> I think this is the way to go.  I was playing around last night with >> re-jiggering the java code into the new >> package(s), and got something reasonable put together.  I'll

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

On Jan 28, 2010, at 12:26 PM, Daniel Rall wrote: > On Thu, Jan 28, 2010 at 12:20 PM, Mark Phippard wrote: >> On Wed, Jan 27, 2010 at 5:18 PM, Hyrum K. Wright >> wrote: >> >>> I think this is the way to go. I was playing around last night with >>> re-jiggering the java code into the new >>> p

Re: [PATCH] v7 #3460

Stefan Sperling wrote on Thu, 28 Jan 2010 at 19:42 +0100: > On Thu, Jan 28, 2010 at 07:18:15PM +0100, Daniel Näslund wrote: > > Index: subversion/libsvn_diff/parse-diff.c > > === > > --- subversion/libsvn_diff/parse-diff.c (revisio

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

On Wed, Jan 27, 2010 at 5:18 PM, Hyrum K. Wright wrote: > I think this is the way to go.  I was playing around last night with > re-jiggering the java code into the new > package(s), and got something reasonable put together.  I'll commit it > shortly, and I invite folks to > comment / criticiz

Re: http://svn.collab.net/repos/svn dead.

Perhaps we could put it back but under a different URL? http://svn.collab.net/repos/svn-until-r40515 This may not resolve Bert's concern, though. Daniel C. Michael Pilato wrote on Thu, 28 Jan 2010 at 11:17 -0500: > Bert Huijben wrote: > > My 'svn export http://svn.collab.net/repos/svn/tags/xx.

Re: http://svn.collab.net/repos/svn dead.

C. Michael Pilato wrote on Wed, 27 Jan 2010 at 20:04 -0500: > Call off the fire engines. Links to resources in that repository should hit > my custom redirect script and pointed folks to the right (new) location. I didn't realize that the redirect script was custom (showed the correct sub-URL at

Re: nested copies broken on trunk

Noorul Islam K M writes: > By any chance after this commit does the test case "reverse_merge_move" > in copy_test.py pass? $ ../../../../src/subversion/tests/cmdline/copy_tests.py 80 XPASS: copy_tests.py 80: reverse merge move It does, but I need to understand the base node behaviour better bef

Re: [PATCH] v7 #3460

On Thu, Jan 28, 2010 at 07:18:15PM +0100, Daniel Näslund wrote: > Index: subversion/libsvn_diff/parse-diff.c > === > --- subversion/libsvn_diff/parse-diff.c (revision 904119) > +++ subversion/libsvn_diff/parse-diff.c (arbet

Re: [PATCH] v7 #3460

On Thu, Jan 28, 2010 at 07:18:15PM +0100, Daniel Näslund wrote: > On Thu, Jan 28, 2010 at 06:29:41PM +0100, Stefan Sperling wrote: > > We could rename it to emit_hunk(), flush_hunk(), hunk_done(), or something > > similar, signifying that the function is responsible for dealing with > > a hunk whic

Re: [PATCH] v7 #3460

On Thu, Jan 28, 2010 at 06:29:41PM +0100, Stefan Sperling wrote: > On Thu, Jan 28, 2010 at 06:10:38PM +0100, Daniel Näslund wrote: > > > And we could rename the function to copy_hunk() which is even shorter. > > > > To copy a hunk is ambigous. When the hunk is rejected we want to copy > > the diff

Re: nested copies broken on trunk

Philip Martin writes: > workqueue.c:run_deletion_postcommit calls svn_wc__db_scan_base_repos > assuming that the deleted file has a base_node entry, but it doesn't > because it was copied. copy_tests.py 8 tests this and it passes. It turns out that it matters whether the deleted file is an imme

Re: NOW can we remove the yellow warning on the website?

Philip Martin wrote: > "C. Michael Pilato" writes: > >> I'd really like to move on from this website task. Yes, there are still >> some TODO items on the pages. But are we ready to call our URL space stable >> enough to allow folks to link to the pages? Can I begin replacing the >> subversion.

Re: NOW can we remove the yellow warning on the website?

"C. Michael Pilato" writes: > I'd really like to move on from this website task. Yes, there are still > some TODO items on the pages. But are we ready to call our URL space stable > enough to allow folks to link to the pages? Can I begin replacing the > subversion.tigris.org site pages with li

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

Greg Stein wrote: > I didn't see it as "mouthing off" :-) Phew :-) > I would also suggest new names for the trees since WORKING has caused > us problems, too. > > PRISTINE might be okay. And something to reference a restructured tree > (WORKING is all about add/copy/move/del). The big conceptua

Re: [PATCH] v6 #3460

On Thu, Jan 28, 2010 at 06:10:38PM +0100, Daniel Näslund wrote: > Fixed! > Fixed! > Fixed! Thanks! > > > @@ -833,13 +851,17 @@ > > > -copy_hunk_text(svn_stream_t *hunk_text, svn_stream_t *target, > > > - const char *abspath, apr_pool_t *scratch_pool) > > > +copy_hunk_lines(svn_s

Re: [PATCH] v6 #3460

On Thu, Jan 28, 2010 at 04:34:08PM +0100, Stefan Sperling wrote: > On Thu, Jan 28, 2010 at 04:03:01PM +0100, Daniel Näslund wrote: > > @@ -588,18 +592,19 @@ > > +/* Indicate in *MATCHED whether the original text of HUNK matches the patch > > + * TARGET at its current line. Lines within FUZZ lines o

Re: [PATCH] docco on WC-DB abspath conventions

And another similar patch. I'll paste this one in-line just to make sure you can read it easily. * subversion/libsvn_wc/wc_db.h Document the conventions about parameter order at the top of the file. Remove a "###" comment about this. [[[ Index: subversion/libsvn_wc/wc_db.h ===

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

I didn't see it as "mouthing off" :-) I would also suggest new names for the trees since WORKING has caused us problems, too. PRISTINE might be okay. And something to reference a restructured tree (WORKING is all about add/copy/move/del). On Jan 28, 2010 9:57 AM, "Julian Foad" wrote: ... and i

[PATCH] docco on WC-DB abspath conventions

Is this trivial patch OK? - Julian * subversion/libsvn_wc/wc_db.h Document the conventions about *_ABSPATH parameters at the top of the file. Remove obsolete "###" comments about this and about pool conventions. Index: subversion/libsvn_wc/wc_db.h

Re: http://svn.collab.net/repos/svn dead.

Bert Huijben wrote: > My 'svn export http://svn.collab.net/repos/svn/tags/xx...@1234' that my > debugger automatically starts on an assertion in a sourcefile doesn't > understand these textual error pages. And the debugger doesn't allow me > to fix these references. Eww... well, I could put the r

Re: nested copies broken on trunk

Stefan Sperling writes: > + svn cp nested-copy/trunk/gamma nested-copy/trunk/gamma.copied > A nested-copy/trunk/gamma.copied > + svn mv nested-copy/trunk/gamma.copied/delta > nested-copy/trunk/gamma.copied/delta.copied > A nested-copy/trunk/gamma.copied/delta.copied > D

Re: NOW can we remove the yellow warning on the website?

- Original Message > From: C. Michael Pilato > To: Mark Phippard > Cc: Subversion Development > Sent: Thu, January 28, 2010 10:56:19 AM > Subject: Re: NOW can we remove the yellow warning on the website? > > Mark Phippard wrote: > > On Thu, Jan 28, 2010 at 10:51 AM, C. Michael Pilato

RE: http://svn.collab.net/repos/svn dead.

> -Original Message- > From: C. Michael Pilato [mailto:cmpil...@collab.net] > Sent: donderdag 28 januari 2010 2:05 > To: Daniel Shahaf > Cc: dev@subversion.apache.org > Subject: Re: http://svn.collab.net/repos/svn dead. > > Daniel Shahaf wrote: > > The repository on

Re: NOW can we remove the yellow warning on the website?

Mark Phippard wrote: > On Thu, Jan 28, 2010 at 10:51 AM, C. Michael Pilato > wrote: >> I'd really like to move on from this website task. Yes, there are still >> some TODO items on the pages. But are we ready to call our URL space stable >> enough to allow folks to link to the pages? > > It is

Re: NOW can we remove the yellow warning on the website?

On Thu, Jan 28, 2010 at 10:51 AM, C. Michael Pilato wrote: > I'd really like to move on from this website task.  Yes, there are still > some TODO items on the pages.  But are we ready to call our URL space stable > enough to allow folks to link to the pages? It is not the end of the world if we w

NOW can we remove the yellow warning on the website?

I'd really like to move on from this website task. Yes, there are still some TODO items on the pages. But are we ready to call our URL space stable enough to allow folks to link to the pages? Can I begin replacing the subversion.tigris.org site pages with links to subversion.apache.org? -- C.

Re: Commit failure via out of date proxy - issue #3561 - with Serf

Julian Foad wrote: > On Thu, 2010-01-28 at 10:23 -0500, C. Michael Pilato wrote: >> Julian Foad wrote: >>> On Wed, 2010-01-20, Julian Foad wrote: I have added issue #3561 to track this >>> Just now, using a client built from today

Re: [PATCH] v5 #3460

On Thu, Jan 28, 2010 at 04:03:01PM +0100, Daniel Näslund wrote: > @@ -588,18 +592,19 @@ >return SVN_NO_ERROR; > } > > -/* Indicate in *MATCHED whether the original text of HUNK > - * matches the patch TARGET at its current line. > - * When this function returns, neither TARGET->CURRENT_LINE

Re: Commit failure via out of date proxy - issue #3561 - with Serf

On Thu, 2010-01-28 at 10:23 -0500, C. Michael Pilato wrote: > Julian Foad wrote: > > On Wed, 2010-01-20, Julian Foad wrote: > >> I have added issue #3561 > >> to track this > > > > Just now, using a client built from today's trunk code, I

Re: [PATCH] v5 #3460

Looks lovely to me. Thanks. - Julian On Thu, 2010-01-28, Daniel Näslund wrote: > Hi again Stefan and Julian :-)! [...] > [[[ > Fix #3460 - svn patch is not fuzzy when applying unidiffs. Refactor some > parts of the hunk parsing while at it. [...]

Re: Commit failure via out of date proxy - issue #3561 - with Serf

Julian Foad wrote: > On Wed, 2010-01-20, Julian Foad wrote: >> I have added issue #3561 >> to track this > > Just now, using a client built from today's trunk code, I got the same > problem when committing with Serf: [...] > In earlier e

Re: [PATCH] v5 #3460

Hi again Stefan and Julian :-)! On Thu, Jan 28, 2010 at 12:53:08PM +, Julian Foad wrote: > > +/* Indicate in *MATCHED whether the original text of HUNK matches the patch > > + * TARGET at its current line. Lines at FUZZ offset from start or end of > > the > > "Lines within FUZZ lines of the

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

... and if that sounded like me just mouthing off against lack of clear docco, but not helping again, sorry but I'd really like to help. - Julian On Thu, 2010-01-28 at 14:51 +, Julian Foad wrote: > On Thu, 2010-01-28 at 15:17 +0100, Neels J Hofmeyr wrote: > > Greg Stein wrote: > > > On Wed,

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

On Thu, 2010-01-28 at 15:17 +0100, Neels J Hofmeyr wrote: > Greg Stein wrote: > > On Wed, Jan 27, 2010 at 16:51, Neels J Hofmeyr wrote: > >> Greg Stein wrote: > >> ... > >>> and recall that BASE == what you checked out from the repository. > >>> WORKING corresponds to added/removed/copied/moved no

Commit failure via out of date proxy - issue #3561 - with Serf

On Wed, 2010-01-20, Julian Foad wrote: > I have added issue #3561 > to track this Just now, using a client built from today's trunk code, I got the same problem when committing with Serf: [[[ $ svn ci -F n-o.patch subversion/libsvn_fs_bas

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

Greg Stein wrote: > On Wed, Jan 27, 2010 at 16:51, Neels J Hofmeyr wrote: >> Greg Stein wrote: >> ... >>> and recall that BASE == what you checked out from the repository. >>> WORKING corresponds to added/removed/copied/moved nodes. For nodes in >> Yes, I learnt this from Bert last week, and also

Re: [PATCH] Fix the awful "200 OK" error message when can't connect to repository

On Tue, 2010-01-26, Ivan Zhakov wrote: > > I looked at this a bit more. First I factored out the error message > > generation into a separate function. > > > > I committed that version as r902836. > > Thanks! > I committed small follow up in r903153 to use SVN_RA_NEON__REQ_ERR > macro instead of a

Re: [PATCH] v4 #3460

On Thu, Jan 28, 2010 at 12:53:08PM +, Julian Foad wrote: > Re. the spam email used as test data - nice idea, but it kind of offends > my eyes to see such junk on my screen :-) I'll have to take the blame for this. The text is used by virtually all patch tests. It popped into my inbox while I w

Re: Probable bug with svn copy

On Tue, 2010-01-26, Noorul Islam K M wrote: > Julian Foad writes: > > Paul Burba wrote: > >> Also, would you mind taking a stab at expanding the test to cover > >> Alan's original problem? Specifically that a second working copy, > >> when updated, gets both the move destination *and* the source

nested copies broken on trunk

Hi, the attached script breaks the working copy beyond repair: + rm -rf nested-copy + mkdir -p nested-copy + mkdir -p nested-copy/trunk + mkdir nested-copy/trunk/gamma + echo delta + > nested-copy/trunk/gamma/delta + svnadmin create /tmp/nested-copy/repos + svn import nested-copy

Re: [PATCH] v4 #3460

Hi Daniel. Thanks for fixing the doc strings. Re. the spam email used as test data - nice idea, but it kind of offends my eyes to see such junk on my screen :-) > +/* Indicate in *MATCHED whether the original text of HUNK matches the patch > + * TARGET at its current line. Lines at FUZZ offset

Re: [PATCH] v4 #3460

On Thu, Jan 28, 2010 at 01:55:08PM +0100, Daniel Näslund wrote: > Index: subversion/libsvn_diff/parse-diff.c Can't read the whole diff right now, just a couple of small remarks: >svn_boolean_t lines_matched; > @@ -630,9 +635,21 @@ > eol_str, FALSE,

Re: [PATCH] v2 conflict notifications hunks has wrong modified_length

On Thu, Jan 28, 2010 at 10:58:17AM +0100, Stefan Sperling wrote: > On Wed, Jan 27, 2010 at 10:30:51PM +0100, Daniel Näslund wrote: > Oops :) > > Don't some tests need their expected output adjusted for this? Strange, I thought I tested it. Fixed now. [[[ Fix wrong modified_length for hunk notifi

Obliterate - milestone 1 reached: the most basic obliteration

Hi, fans of "obliterate". I am pleased to announce that a very restricted form of "svn obliterate" is now working. According to the plan , I intended to get a simple kind of obliteration (last version of a no

Re: [PATCH] v4 #3460

Hi! On Thu, Jan 28, 2010 at 11:31:08AM +0100, Stefan Sperling wrote: > On Thu, Jan 28, 2010 at 10:03:45AM +0100, Daniel Näslund wrote: > > Index: subversion/libsvn_diff/parse-diff.c > > === > > --- subversion/libsvn_diff/parse-diff.c

Re: [PATCH] v3 #3460

On Thu, Jan 28, 2010 at 11:31:08AM +0100, Stefan Sperling wrote: > On Thu, Jan 28, 2010 at 10:03:45AM +0100, Daniel Näslund wrote: > > @@ -833,13 +855,17 @@ > > /* Copy HUNK_TEXT into TARGET, line by line, such that the line filter > > * and transformation callbacks set on HUNK_TEXT by the diff

Re: [PATCH] v3 #3460

On Thu, Jan 28, 2010 at 10:03:45AM +0100, Daniel Näslund wrote: > The log message: > > [[[ > Fix #3460 - svn patch is not fuzzy when applying unidiffs. Some more nitpicking: > Index: subversion/libsvn_diff/parse-diff.c > === > --- s

Re: [PATCH] conflict notifications hunks has wrong modified_length

On Wed, Jan 27, 2010 at 10:30:51PM +0100, Daniel Näslund wrote: > Hi! > > [[[ > Fix wrong modified_length for hunk notifications. > > * subversion/libsvn_client/patch.c > (maybe_send_patch_notification): See above. > > Patch by: Daniel Näslund > ]]] > Index: subversion/libsvn_client/patch.c

[PATCH] v3 #3460

On Wed, Jan 27, 2010 at 11:52:33PM +, Julian Foad wrote: > Daniel Näslund wrote: > > Removed some debug statements. > > > > On Wed, Jan 27, 2010 at 08:59:02PM +0100, Daniel Näslund wrote: > > [[[ > > Fix #3460 - svn patch is not fuzzy when applying unidiffs. > > > [...] > > Hi Daniel. Just o