Re: SQL backend database scheme

2010-03-31 Thread Philipp Marek
Hello Jan! On Mittwoch, 31. März 2010, Jan Horák wrote: > 30.3.2010 13:55, Philipp Marek wrote: > > I looked at that, and I'd like to post two wishes: > > * Please provide representations with a SHA1 (or similar) field; > > then it's possible to split blocks on manber-borders, to save > >

Re: 1.6.10 up for testing/signing

2010-03-31 Thread Paul Burba
On Wed, Mar 31, 2010 at 6:58 PM, Joe Swatosh wrote: > On Wed, Mar 31, 2010 at 1:29 PM, Hyrum K. Wright > wrote: >> On Wed, Mar 31, 2010 at 1:01 PM, Hyrum K. Wright < >> hyrum_wri...@mail.utexas.edu> wrote: >> >>> 1.6.10 tarballs are up, the magic revision is r929659: >>> >>> http://orac.ece.utexa

Re: 1.6.10 up for testing/signing

2010-03-31 Thread Joe Swatosh
On Wed, Mar 31, 2010 at 1:29 PM, Hyrum K. Wright wrote: > On Wed, Mar 31, 2010 at 1:01 PM, Hyrum K. Wright < > hyrum_wri...@mail.utexas.edu> wrote: > >> 1.6.10 tarballs are up, the magic revision is r929659: >> >> http://orac.ece.utexas.edu/pub/svn/1.6.10/ >> >> Download, test, sign and send your

Re: allowing multiple conflicts in storage

2010-03-31 Thread Julian Foad
Stefan Sperling wrote: > On Wed, Mar 31, 2010 at 07:34:41PM +0100, Julian Foad wrote: > > OK I've attached a patch with ideas and suggestions. (The above was > > meant to be a concept that should be embodied in the design, not a > > design in itself.) > > I like it, please commit! Done in r92970

Re: 1.6.10 up for testing/signing

2010-03-31 Thread Mark Phippard
On Windows, Basic_tests 37 seems to be failing as well. On Wed, Mar 31, 2010 at 4:29 PM, Hyrum K. Wright wrote: > On Wed, Mar 31, 2010 at 1:01 PM, Hyrum K. Wright < > hyrum_wri...@mail.utexas.edu> wrote: > >> 1.6.10 tarballs are up, the magic revision is r929659: >> >> http://orac.ece.utexas.ed

Re: 1.6.10 up for testing/signing

2010-03-31 Thread Hyrum K. Wright
On Wed, Mar 31, 2010 at 1:01 PM, Hyrum K. Wright < hyrum_wri...@mail.utexas.edu> wrote: > 1.6.10 tarballs are up, the magic revision is r929659: > > http://orac.ece.utexas.edu/pub/svn/1.6.10/ > > Download, test, sign and send your sigs back to me. (And don't even think > about declaring this as "

Re: allowing multiple conflicts in storage

2010-03-31 Thread Stefan Sperling
On Wed, Mar 31, 2010 at 07:34:41PM +0100, Julian Foad wrote: > OK I've attached a patch with ideas and suggestions. (The above was > meant to be a concept that should be embodied in the design, not a > design in itself.) I like it, please commit! > In my dream world, the logic of "update" is > h

Experiences of a Subversion FS backend developer

2010-03-31 Thread C. Michael Pilato
As many of you already know, Google recently announced that they had (again) written a new filesystem backend for Subversion, built atop their BigTable database system. As it turned out, Jon Trowbridge -- primary author of that new backend -- was visiting the Google NYC office last week at the sam

1.6.10 up for testing/signing

2010-03-31 Thread Hyrum K. Wright
1.6.10 tarballs are up, the magic revision is r929659: http://orac.ece.utexas.edu/pub/svn/1.6.10/ Download, test, sign and send your sigs back to me. (And don't even think about declaring this as "released" until I say so, for reasons I won't expound upon here.) -Hyrum

Re: allowing multiple conflicts in storage

2010-03-31 Thread Julian Foad
On Wed, 2010-03-31, Stefan Sperling wrote: > On Wed, Mar 31, 2010 at 01:44:23PM +0100, Julian Foad wrote: > > The Source of the Incoming Change > > = > > > > I suggest something like (? means an optional field): > > > > * A diff between nodes that have a location

Re: RFC: Release process amendment (was Re: Vetoing latest issue #3020 fix in 1.6.10)

2010-03-31 Thread C. Michael Pilato
Greg Stein wrote: > On Wed, Mar 31, 2010 at 11:21, Mark Phippard wrote: >> On Wed, Mar 31, 2010 at 11:10 AM, C. Michael Pilato >> wrote: >>> Hyrum K. Wright wrote: > I'll work on a fix that can handle both use cases, but for now I am > changing my vote to -1 and reverting this backport.

Re: svn commit: r929382 - /subversion/branches/1.6.x-wc-ng-error/subversion/libsvn_wc/questions.c

2010-03-31 Thread Peter Samuelson
[Bert Huijben] > > > >wc_db_path = svn_path_join_many(pool, abspath, > > SVN_WC_ADM_DIR_NAME, > > > >"wc.db", NULL); > > > > > > Shouldn't this use svn_wc_get_adm_dir()? > > > > Probably ... but since this is 1.6-specific code (it is not and never > > will

Re: RFC: Release process amendment (was Re: Vetoing latest issue #3020 fix in 1.6.10)

2010-03-31 Thread Greg Stein
On Wed, Mar 31, 2010 at 11:21, Mark Phippard wrote: > On Wed, Mar 31, 2010 at 11:10 AM, C. Michael Pilato > wrote: >> Hyrum K. Wright wrote: I'll work on a fix that can handle both use cases, but for now I am changing my vote to -1 and reverting this backport. >>> >>> And just so

RE: svn commit: r929382 - /subversion/branches/1.6.x-wc-ng-error/subversion/libsvn_wc/questions.c

2010-03-31 Thread Bert Huijben
> -Original Message- > From: Peter Samuelson [mailto:pe...@p12n.org] > Sent: woensdag 31 maart 2010 18:33 > To: dev@subversion.apache.org > Subject: Re: svn commit: r929382 - /subversion/branches/1.6.x-wc-ng- > error/subversion/libsvn_wc/questions.c > > > [Daniel Shahaf] > > > @@ -62,7

Re: svn commit: r929382 - /subversion/branches/1.6.x-wc-ng-error/subversion/libsvn_wc/questions.c

2010-03-31 Thread Julian Foad
Peter Samuelson wrote: > [Daniel Shahaf] > > > @@ -62,7 +63,12 @@ is_inside_wc_ng(const char *abspath, > > > > > >wc_db_path = svn_path_join_many(pool, abspath, SVN_WC_ADM_DIR_NAME, > > >"wc.db", NULL); > > > > Shouldn't this use svn_wc_get_adm_dir()? > >

Re: svn commit: r929382 - /subversion/branches/1.6.x-wc-ng-error/subversion/libsvn_wc/questions.c

2010-03-31 Thread Peter Samuelson
[Daniel Shahaf] > > @@ -62,7 +63,12 @@ is_inside_wc_ng(const char *abspath, > > > >wc_db_path = svn_path_join_many(pool, abspath, SVN_WC_ADM_DIR_NAME, > >"wc.db", NULL); > > Shouldn't this use svn_wc_get_adm_dir()? Probably ... but since this is 1.6-spec

Re: RFC: Release process amendment (was Re: Vetoing latest issue #3020 fix in 1.6.10)

2010-03-31 Thread Daniel Shahaf
Hyrum K. Wright wrote on Wed, 31 Mar 2010 at 10:41 -0500: > The counter-argument, of course, is that we set the deadline not at > the time of tag, but at the time of when the last merge can be > performed. While possible, we may lack the discipline to *not* > include a fix which receives its third

Re: RFC: Release process amendment (was Re: Vetoing latest issue #3020 fix in 1.6.10)

2010-03-31 Thread Hyrum K. Wright
On Mar 31, 2010, at 10:10 AM, C. Michael Pilato wrote: > Hyrum K. Wright wrote: >>> I'll work on a fix that can handle both use cases, but for now I am >>> changing my vote to -1 and reverting this backport. >>> >> >> And just so folks know, Paul's got the RM's blessing on this. > > Great that

Re: RFC: Release process amendment (was Re: Vetoing latest issue #3020 fix in 1.6.10)

2010-03-31 Thread Justin Erenkrantz
On Wed, Mar 31, 2010 at 8:10 AM, C. Michael Pilato wrote: > Hyrum K. Wright wrote: >>> I'll work on a fix that can handle both use cases, but for now I am >>> changing my vote to -1 and reverting this backport. >>> >> >> And just so folks know, Paul's got the RM's blessing on this. > > Great that

Re: RFC: Release process amendment (was Re: Vetoing latest issue #3020 fix in 1.6.10)

2010-03-31 Thread Mark Phippard
On Wed, Mar 31, 2010 at 11:10 AM, C. Michael Pilato wrote: > Hyrum K. Wright wrote: >>> I'll work on a fix that can handle both use cases, but for now I am >>> changing my vote to -1 and reverting this backport. >>> >> >> And just so folks know, Paul's got the RM's blessing on this. > > Great that

Re: SQL backend database scheme

2010-03-31 Thread Jan Horák
30.3.2010 13:55, Philipp Marek wrote: Hello Jan! On Montag, 29. März 2010, Jan Horák wrote: I've prepared a database scheme of the upcoming MySQL backend, it is avaible at: http://www.stud.fit.vutbr.cz/~xhorak50/diplomathesis/files/100329_mysql_des ign_v1.png I looked at that, and I'

RFC: Release process amendment (was Re: Vetoing latest issue #3020 fix in 1.6.10)

2010-03-31 Thread C. Michael Pilato
Hyrum K. Wright wrote: >> I'll work on a fix that can handle both use cases, but for now I am >> changing my vote to -1 and reverting this backport. >> > > And just so folks know, Paul's got the RM's blessing on this. Great that he has your blessing, but I would suggest that he really doesn't nee

Re: Vetoing latest issue #3020 fix in 1.6.10

2010-03-31 Thread Paul Burba
On Wed, Mar 31, 2010 at 10:13 AM, Hyrum K. Wright wrote: > > > On Wed, Mar 31, 2010 at 8:05 AM, Paul Burba wrote: >> >> Mike and I were discussing the changes I made in >> http://svn.apache.org/viewvc?view=revision&revision=927243 to fix >> issue #3020 and which were backported to 1.6.x.  There i

Re: Vetoing latest issue #3020 fix in 1.6.10

2010-03-31 Thread Hyrum K. Wright
On Wed, Mar 31, 2010 at 8:05 AM, Paul Burba wrote: > Mike and I were discussing the changes I made in > http://svn.apache.org/viewvc?view=revision&revision=927243 to fix > issue #3020 and which were backported to 1.6.x. There is a regression > in that fix and I am changing my vote to -1 and pull

Working copies on Windows FAT partitions (E.g. usb sticks) broken in 1.6.10, or

2010-03-31 Thread Bert Huijben
See ^/subversion/branches/1.6.x/STATUS: * r908980, r908981 This followup on r896915, makes sure that the Windows specific remove readonly attribute code still works on FAT32 filesystems. (The FAT32 driver reports a very different error than the NTFS driver) Justification: Without

Re: [PATCH] change behaviour of svn_client__get_revision_number()?

2010-03-31 Thread Neels J Hofmeyr
For those who have difficulties seeing the attachment, let me repost it inline. You can also get it at http://kleinekatze.de/get_revision_number.20100331-1154 ~Neels [[[ Remove entry_t usage from svn_client__get_revision_number(). * subversion/include/private/svn_wc_private.h

Vetoing latest issue #3020 fix in 1.6.10

2010-03-31 Thread Paul Burba
Mike and I were discussing the changes I made in http://svn.apache.org/viewvc?view=revision&revision=927243 to fix issue #3020 and which were backported to 1.6.x. There is a regression in that fix and I am changing my vote to -1 and pulling it from 1.6.x (and today's roll of 1.6.10). The fix in r

Re: allowing multiple conflicts in storage

2010-03-31 Thread Stefan Sperling
On Wed, Mar 31, 2010 at 02:14:13PM +0100, Julian Foad wrote: > Where I talk about "libsvn_wc versus libsvn_client", I didn't mean that, > I meant two sub-layers within libsvn_wc, the lower layer that handles > purely storage versus the upper layer that performs updates etc. and > needs to write the

Re: allowing multiple conflicts in storage

2010-03-31 Thread Stefan Sperling
On Wed, Mar 31, 2010 at 01:44:23PM +0100, Julian Foad wrote: > The Source of the Incoming Change > = > > I suggest something like (? means an optional field): > > * A diff between nodes that have a location in a repository. > > left=(repo, rev, relpath, sh

Out of memory error while merging

2010-03-31 Thread RoboJ1M
Hi, This thread was originally posted on the svn-users list but I got no response. I'm reposting it here in the hope that this can be addressed. I'm having a problem with our new SVN system. Initially I thought it was a problem with TortoiseSVN but after discussing it on their mailing list and pe

Re: allowing multiple conflicts in storage

2010-03-31 Thread Julian Foad
Where I talk about "libsvn_wc versus libsvn_client", I didn't mean that, I meant two sub-layers within libsvn_wc, the lower layer that handles purely storage versus the upper layer that performs updates etc. and needs to write the conflict descriptions into the storage. I like to think of the soft

Re: allowing multiple conflicts in storage

2010-03-31 Thread Julian Foad
On Tue, 2010-03-30, Stefan Sperling wrote: > On Tue, Mar 30, 2010 at 05:56:54PM +0100, Julian Foad wrote: > > > > > Conflict meta data storage in wc-ng > > > === [...] I'm putting the last paragraph first for clarity. > > I don't think > > it is right to call "patc

Re: allowing multiple conflicts in storage (Re: svn commit: r928806 - /subversion/trunk/notes/wc-ng/conflict-storage)

2010-03-31 Thread Stefan Sperling
On Tue, Mar 30, 2010 at 08:04:55PM +0200, Stefan Sperling wrote: > Actually, I think this becomes much cleaner once we recognize > that what's right now stored in COMMON is actually operation-specific. I've committed this in r929504. We can still move the OPERATION skels around, depending on how

Re: redundant path functions

2010-03-31 Thread Julian Foad
On Wed, 2010-03-31 at 08:15 -0400, C. Michael Pilato wrote: > Stefan Sperling wrote: > > I too remember being confused as to which interface I should be using. > > And I think having is_ancestor not be the reverse of is_child is a bad idea. > > We'll likely find mis-use of either interface in the c

Re: allowing multiple conflicts in storage (Re: svn commit: r928806 - /subversion/trunk/notes/wc-ng/conflict-storage)

2010-03-31 Thread Stefan Sperling
On Wed, Mar 31, 2010 at 09:50:33AM +0200, Bert Huijben wrote: > > -Original Message- > > From: Stefan Sperling > > Why not allow application of a patch which carries a diff that would > > not > > touch a conflicted property before the user has dealt with property > > conflicts? > > Merge t

Re: description of Peg Revision Algorithm is incomplete

2010-03-31 Thread C. Michael Pilato
Julian Foad wrote: > Vincent Lefevre wrote: > [...] >> Actually, I don't think that peg revisions (i.e. without following the >> history) make much sense on objects relative to the current directory >> (unless its URL has not changed since the peg-rev). > > That is the point I was trying to make:

Re: redundant path functions

2010-03-31 Thread C. Michael Pilato
Stefan Sperling wrote: > I too remember being confused as to which interface I should be using. > And I think having is_ancestor not be the reverse of is_child is a bad idea. > We'll likely find mis-use of either interface in the code base, where > the author didn't realise the subtle semantics of

Re: S.T.O.-->S.A.O. Migration and Mergeinfo Revision Offsets

2010-03-31 Thread C. Michael Pilato
Paul Burba wrote: > This problem wasn't really about self-referential mergeinfo per se, > rather it was load bug, see the reopened issue #3020: > http://subversion.tigris.org/issues/show_bug.cgi?id=3020#desc9 > > These bugs were fixed in > http://svn.apache.org/viewvc?view=revision&revision=927243

Re: redundant path functions

2010-03-31 Thread Stefan Sperling
On Wed, Mar 31, 2010 at 11:34:35AM +0200, Bert Huijben wrote: > > > > -Original Message- > > From: Greg Stein [mailto:gst...@gmail.com] > > Sent: woensdag 31 maart 2010 2:47 > > To: dev@subversion.apache.org > > Subject: redundant path functions > > > > The following functions seem very

Re: logging #svn-dev

2010-03-31 Thread neels
I'd like to announce that #svn-dev is now logged. You will find ChanServ telling you so whenever you join #svn-dev. I've also added a note to the topic out of sheer enthusiasm, but I'd be fine with removing that soon and only keeping the chanserv message as #svn does. And I'd like to emphasize ag

[PATCH] change behaviour of svn_client__get_revision_number()?

2010-03-31 Thread neels
Hi all, I have a patch that passes 'make check', but changes the behaviour of svn_client__get_revision_number() in ways that surpass my current understanding. Previously, this function would follow the overloadedness of entry->revision, in ways not entirely clear to me. read_entries_new() does th

Re: description of Peg Revision Algorithm is incomplete

2010-03-31 Thread Julian Foad
Vincent Lefevre wrote: [...] > Actually, I don't think that peg revisions (i.e. without following the > history) make much sense on objects relative to the current directory > (unless its URL has not changed since the peg-rev). That is the point I was trying to make: a peg rev specifier as define

RE: allowing multiple conflicts in storage

2010-03-31 Thread Bert Huijben
> -Original Message- > From: Stefan Sperling [mailto:s...@elego.de] > Sent: dinsdag 30 maart 2010 19:34 > To: Julian Foad > Cc: Bert Huijben; dev@subversion.apache.org > Subject: Re: allowing multiple conflicts in storage > > On Tue, Mar 30, 2010 at 05:56:54PM +0100, Julian Foad wrote: >

RE: wc-ng base/working nodes in a copied tree

2010-03-31 Thread Bert Huijben
> -Original Message- > From: Philip Martin [mailto:philip.mar...@wandisco.com] > Sent: woensdag 31 maart 2010 11:20 > To: Greg Stein > Cc: neels; dev@subversion.apache.org > Subject: Re: wc-ng base/working nodes in a copied tree > > Greg Stein writes: > > > On Wed, Mar 24, 2010 at 16:4

RE: redundant path functions

2010-03-31 Thread Bert Huijben
> -Original Message- > From: Greg Stein [mailto:gst...@gmail.com] > Sent: woensdag 31 maart 2010 2:47 > To: dev@subversion.apache.org > Subject: redundant path functions > > The following functions seem very redundant. Because each is slightly > different, I always have to compare/contra

Re: [PATCH] Remove obsolute doc comment about 'svn patch' using diff callbacks

2010-03-31 Thread Julian Foad
On Wed, 2010-03-31, Daniel Näslund wrote: > Hi! > > [[[ > Remove obsolute doc comment about 'svn patch' using diff callbacks. The > callbacks were removed in r879144 when we shaved off the SVNPATCH blocks > and only kept the unidiff part. > > * subversion/include/svn_wc.h > (svn_wc_diff_callbac

Re: wc-ng base/working nodes in a copied tree

2010-03-31 Thread Philip Martin
Greg Stein writes: > On Wed, Mar 24, 2010 at 16:41, Philip Martin > wrote: >> neels writes: >>> On 23 March 2010 09:11, Greg Stein wrote: On Mon, Mar 22, 2010 at 17:59, Philip Martin wrote: >> >> We should consider using copyfrom_repos_path.  The current method of >> only storing

Re: [PATCH] Follow-up to r922176 was:Re: svn commit: r922176 - in /subversion/trunk/subversion: include/svn_wc.h libsvn_wc/revision_status.c svnversion/main.c

2010-03-31 Thread Julian Foad
On Tue, 2010-03-30, Daniel Näslund wrote: > Ping! This patch has not been revieved [...] > > [[[ > > Follow-up to r922176. Fix that tree changes were not considered when > > determining if the wc has modifications. > > > > * subversion/libsvn_wc/revision_status.c > > (analyze_status): Determine

Re: logging #svn-dev

2010-03-31 Thread Julian Foad
On Tue, 2010-03-30 at 10:29 -0700, Justin Erenkrantz wrote: > On Tue, Mar 30, 2010 at 6:47 AM, Lieven Govaerts wrote: > > No, that has never been the reason why the channel isn't logged. > > > > If I remember correctly, the reason why #svn-dev isn't logged, is > > because that would promote the id

Re: Fwd: Building for Win32 - tests fail

2010-03-31 Thread Julian Foad
David Darj wrote: [...] > But when running against http:// I get >22 tests SKIPPED >25 tests XFAILED >74 tests FAILED (list below) >1 tests XPASSED > > Searching for some of them didn't give me any clues. > > My environment: > WindowsXP MCE, fully updated (except IE7 and IE8) us

[PATCH] Remove obsolute doc comment about 'svn patch' using diff callbacks

2010-03-31 Thread Daniel Näslund
Hi! [[[ Remove obsolute doc comment about 'svn patch' using diff callbacks. The callbacks were removed in r879144 when we shaved off the SVNPATCH blocks and only kept the unidiff part. * subversion/include/svn_wc.h (svn_wc_diff_callbacks4_t): See above. ]]] Daniel Index: subversion/include/svn

RE: allowing multiple conflicts in storage (Re: svn commit: r928806 - /subversion/trunk/notes/wc-ng/conflict-storage)

2010-03-31 Thread Bert Huijben
> -Original Message- > From: Stefan Sperling [mailto:s...@elego.de] > Sent: dinsdag 30 maart 2010 18:15 > To: Bert Huijben > Cc: dev@subversion.apache.org > Subject: Re: allowing multiple conflicts in storage (Re: svn commit: > r928806 - /subversion/trunk/notes/wc-ng/conflict-storage) >