Re: Subversion merge creates bogus tree conflicts

2013-01-14 Thread Ben Reser
On Mon, Jan 14, 2013 at 8:49 AM, David Moon wrote: > Subversion creates an unnecessary tree conflict when two branches of a > directory are merged. See the transcript below. Since the contents of the > directory do not conflict between the two branches, it should just add both > subdirectories t

Re: svn commit: r1427237 - /subversion/trunk/subversion/libsvn_diff/diff_file.c

2013-01-14 Thread Johan Corveleyn
On Mon, Dec 31, 2012 at 9:09 PM, wrote: > Author: rhuijben > Date: Mon Dec 31 20:09:21 2012 > New Revision: 1427237 > > URL: http://svn.apache.org/viewvc?rev=1427237&view=rev > Log: > Following up on r1427210, document some of the unaligned access magic by using > similar pointer calculations in

Re: svn commit: r1427210 - /subversion/trunk/subversion/libsvn_diff/diff_file.c

2013-01-14 Thread Johan Corveleyn
On Mon, Dec 31, 2012 at 7:07 PM, wrote: > Author: rhuijben > Date: Mon Dec 31 18:07:29 2012 > New Revision: 1427210 > > URL: http://svn.apache.org/viewvc?rev=1427210&view=rev > Log: > Following up on r1427197, apply a similar fix to the suffix scanning. Avoid > updating variables until they are k

Subversion merge creates bogus tree conflicts

2013-01-14 Thread David Moon
Subversion creates an unnecessary tree conflict when two branches of a directory are merged. See the transcript below. Since the contents of the directory do not conflict between the two branches, it should just add both subdirectories to the directory and not report any conflict. In my

RE: 1.8 Release Status : Test Review Task Update

2013-01-14 Thread Bert Huijben
> -Original Message- > From: Paul Burba [mailto:ptbu...@gmail.com] > Sent: maandag 14 januari 2013 22:20 > To: Subversion Development > Cc: Stefan Sperling; Julian Foad; Bert Huijben > Subject: 1.8 Release Status : Test Review Task Update > > Re the roadmap item "Test Review - Determine

Re: 1.8 Release Status : Test Review Task Update

2013-01-14 Thread Julian Foad
C. Michael Pilato wrote: > On 01/14/2013 04:19 PM, Paul Burba wrote: >>  There are still three XFailing tests with no associated issue: >> >>    LISTING: update_tests.py >>    Test #  Mode   Test Description >>    --  -  >>      60    XFAIL  update locally moved dir with l

Re: 1.8 Release Status : Test Review Task Update

2013-01-14 Thread C. Michael Pilato
On 01/14/2013 04:19 PM, Paul Burba wrote: > There are still three XFailing tests with no associated issue: > > LISTING: update_tests.py > Test # Mode Test Description > -- - > 60XFAIL update locally moved dir with leaf del > 61XFAIL update loca

Re: 1.8 Release Status : Test Review Task Update

2013-01-14 Thread Julian Foad
Paul Burba wrote: [...] > we have only one XFailing test associated with an issue with the 1.8.0 > milestone (and it appears Julian is actively working on this, at least > it's assigned to him and marked as started): > >   LISTING: merge_tests.py >   Test #  Mode  Test Description >            

1.8 Release Status : Test Review Task Update

2013-01-14 Thread Paul Burba
Re the roadmap item "Test Review - Determine which XFail and WIP tests should remain so, and which need to be fixed before release." We are almost done, only 5 Xfailing tests remain that are either associated with a 1.8.0 issue or no issue. We currently have no WIP issues. Details below. Ignori

Re: svn commit: r1432778 - in /subversion/trunk/tools/server-side/svnpubsub: README.txt commit-hook.py daemonize.py example.conf irkerbridge.py notes/ svnpubsub/client.py svnpubsub/server.py svnwcsub.

2013-01-14 Thread Greg Stein
On Jan 14, 2013 11:55 AM, "Ben Reser" wrote: >... > I should have sent an email to the dev list explaining the outcome of > our discussion and the plan. I'm sorry. I withdraw my -1. IRC is not where the community is located, nor is it a place for decision-making. -g

Re: svn commit: r1432778 - in /subversion/trunk/tools/server-side/svnpubsub: README.txt commit-hook.py daemonize.py example.conf irkerbridge.py notes/ svnpubsub/client.py svnpubsub/server.py svnwcsub.

2013-01-14 Thread Ben Reser
On Sun, Jan 13, 2013 at 11:22 PM, Greg Stein wrote: > -1 > > What the hell? The XML feature is used by the ASF. > > Why do you feel you can unilaterally remove features like this? Or create > such incompatible changes in a system that is/has already been deployed? > > Ridiculous. > > Unhappy, > -g

Re: svn commit: r1432778 - in /subversion/trunk/tools/server-side/svnpubsub: README.txt commit-hook.py daemonize.py example.conf irkerbridge.py notes/ svnpubsub/client.py svnpubsub/server.py svnwcsub.

2013-01-14 Thread Ben Reser
On Sun, Jan 13, 2013 at 10:46 PM, Branko Čibej wrote: > Why? If I understand this change, the result will be a not very standard > stream of nul-terminated JSON objects. While the svnpubsub client will > parse that, other JSON-consuming tools will need extra work. > > Why not return a proper JSON

Re: [PATCH] Implement svnadmin verify --keep-going

2013-01-14 Thread Prabhu Gnana Sundar
Stefan Sperling wrote: >Prabhu, any news on this? I would like to see this feature committed. >Is there anything I could do to help move it along? > Thank you Stefan... I am working on this closely. I have been getting great help from Julian and am working on his last suggestions and improvi

Re: [PATCH] Implement svnadmin verify --keep-going

2013-01-14 Thread Prabhu Gnana Sundar
Julian Foad wrote: >What holds me back from committing it is lack of a test that at least >exercises the 'keep-going' functionality (that is, reports on another >revision after reporting a failed revision) and lack of evidence that >it has been tested and found to work as expected in a few diff

Re: [PATCH] Implement svnadmin verify --keep-going

2013-01-14 Thread Julian Foad
Stefan Sperling wrote: > Prabhu, any news on this? I would like to see this feature committed. > Is there anything I could do to help move it along? > > Julian, do you think Prabhu's latest patch is ready for commit, > provided Prabhu or I take care of any unaddressed concerns in > follow-up patc

Re: [PATCH] Implement svnadmin verify --keep-going

2013-01-14 Thread Stefan Sperling
Prabhu, any news on this? I would like to see this feature committed. Is there anything I could do to help move it along? Julian, do you think Prabhu's latest patch is ready for commit, provided Prabhu or I take care of any unaddressed concerns in follow-up patches? Or would committing it to trunk

Re: svn commit: r1432778 - in /subversion/trunk/tools/server-side/svnpubsub: README.txt commit-hook.py daemonize.py example.conf irkerbridge.py notes/ svnpubsub/client.py svnpubsub/server.py svnwcsub.

2013-01-14 Thread Branko Čibej
On 14.01.2013 11:02, Daniel Shahaf wrote: > Branko Čibej wrote on Mon, Jan 14, 2013 at 07:46:16 +0100: >> On 14.01.2013 02:16, bre...@apache.org wrote: >>> - Each JSON record is separated with a null character. >> Why? If I understand this change, the result will be a not very standard >> stream of

Re: Subversion & Windows

2013-01-14 Thread Branko Čibej
On 14.01.2013 09:10, Andre Colomb wrote: > Sorry, I forgot to put in the link: > [1]: http://coapp.org Thanks! I'll look at that. -- Brane > Andre Colomb wrote: >> Branko Čibej wrote: >>> JFTR, I'm putting together a set of Windows deveopment environments for >>> trunk/1.8. >>> >>> The idea is t

Re: svn commit: r1432778 - in /subversion/trunk/tools/server-side/svnpubsub: README.txt commit-hook.py daemonize.py example.conf irkerbridge.py notes/ svnpubsub/client.py svnpubsub/server.py svnwcsub.

2013-01-14 Thread Daniel Shahaf
Branko Čibej wrote on Mon, Jan 14, 2013 at 07:46:16 +0100: > On 14.01.2013 02:16, bre...@apache.org wrote: > > - Each JSON record is separated with a null character. > > Why? If I understand this change, the result will be a not very standard > stream of nul-terminated JSON objects. While the svnp

Re: svn commit: r1432778 - in /subversion/trunk/tools/server-side/svnpubsub: README.txt commit-hook.py daemonize.py example.conf irkerbridge.py notes/ svnpubsub/client.py svnpubsub/server.py svnwcsub.

2013-01-14 Thread Daniel Shahaf
Greg Stein wrote on Mon, Jan 14, 2013 at 02:22:02 -0500: > -1 > > What the hell? The XML feature is used by the ASF. > > Why do you feel you can unilaterally remove features like this? Or create > such incompatible changes in a system that is/has already been deployed? > http://subversion.tigri

Re: [Issue 4100] 'svnrdump dump' should honor the peg revision syntax

2013-01-14 Thread Neels Hofmeyr
On Fri, 11 Jan 2013 14:52:12 -0500 "C. Michael Pilato" wrote: > Hrm. You know, the 'svnrdump dump' usage itself is just plain > broken. It appears to mean "dump the history of URL, perhaps for [...] Thanks for clarifying a few things. I see you have it figured out, at least better than I have.

Re: Subversion & Windows

2013-01-14 Thread Andre Colomb
Sorry, I forgot to put in the link: [1]: http://coapp.org Andre Colomb wrote: > Branko Čibej wrote: >> JFTR, I'm putting together a set of Windows deveopment environments for >> trunk/1.8. >> >> The idea is to create several packages of pre-built dependencies (debug, >> non-debug) x (vs2010, vs20

Re: Subversion & Windows

2013-01-14 Thread Andre Colomb
Branko Čibej wrote: > JFTR, I'm putting together a set of Windows deveopment environments for > trunk/1.8. > > The idea is to create several packages of pre-built dependencies (debug, > non-debug) x (vs2010, vs2010) x (x86, x64) and one or two VM images. Just in case you haven't heard of it yet,