Re: An analysis of possible tree conflicts during update

2009-12-02 Thread Stefan Sperling
On Wed, Dec 02, 2009 at 08:53:00AM +0100, Daniel Näslund wrote: [[[ * When svn update or svn switch raises a tree conflict, it shall update the victim's base version from OLD to THEIRS, and leave the working version in a state that would be committable (but for the explicit check that

Incubator status page

2009-12-02 Thread Gavin
Hi All, At the top of http://incubator.apache.org/projects/subversion.html there are 9 links all pointing to tigris/collabnet etc. If someone wants to provide the ASF equivalent pages I'll make the necessary changes to that document ( or say if no equivalent exists yet.) Thanks Gav...

Re: An analysis of possible tree conflicts during update

2009-12-02 Thread Julian Foad
Stefan Sperling wrote: On Wed, Dec 02, 2009 at 08:53:00AM +0100, Daniel Näslund wrote: Intro == This thread was basically about me trying to convince myself that the approach in notes/tree-conflicts/resolution.txt holds. Here's an attempt to describe the state the WC is in during

Re: An analysis of possible tree conflicts during update

2009-12-02 Thread Stefan Sperling
On Wed, Dec 02, 2009 at 12:57:31PM +, Julian Foad wrote: 1. Locale add, incoming add [...] - I was doing roughly the same thing but the item is a bit different. - merge the two items - manual 2-way merge (or 3-way if both are w/hist and it's the same copy-from source) -

Re: Incubator status page

2009-12-02 Thread Hyrum K. Wright
On Dec 2, 2009, at 6:42 AM, Gavin wrote: Hi All, At the top of http://incubator.apache.org/projects/subversion.html there are 9 links all pointing to tigris/collabnet etc. If someone wants to provide the ASF equivalent pages I'll make the necessary changes to that document ( or say if

Re: Incubator status page

2009-12-02 Thread Julian Foad
On Wed, 2009-12-02 at 07:51 -0600, Hyrum K. Wright wrote: On Dec 2, 2009, at 6:42 AM, Gavin wrote: Hi All, At the top of http://incubator.apache.org/projects/subversion.html there are 9 links all pointing to tigris/collabnet etc. If someone wants to provide the ASF equivalent

Trouble building JavaHL - ...ConflictDescriptor_Action.h not found

2009-12-02 Thread Julian Foad
A javahl build issue. (This is the first time I've got this far with building javahl.) To compile EnumMapper.cpp it first needs header files including org_tigris_subversion_javahl_ConflictDescriptor_Action.h. In directory obj-dir/subversion/bindings/javahl/include/ it has created most of the

Re: Incubator status page

2009-12-02 Thread Hyrum K. Wright
On Dec 2, 2009, at 8:22 AM, Julian Foad wrote: On Wed, 2009-12-02 at 07:51 -0600, Hyrum K. Wright wrote: On Dec 2, 2009, at 6:42 AM, Gavin wrote: Hi All, At the top of http://incubator.apache.org/projects/subversion.html there are 9 links all pointing to tigris/collabnet etc. If

Re: Trouble building JavaHL - ...ConflictDescriptor_Action.h not found

2009-12-02 Thread Philip Martin
Mark Phippard markp...@gmail.com writes: I am guessing that you are not using the Sun JDK? You pretty much need to have that. The open-source JDK's just do not cut it. I can build javahl on Debian using the openjdk-6-jdk package. I can't get the tests to run: $ nice make check-javahl

Re: svn commit: r886164 - in /subversion/trunk/subversion: svn/main.c tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout

2009-12-02 Thread Paul Burba
On Wed, Dec 2, 2009 at 9:52 AM, cmpil...@apache.org wrote: Author: cmpilato Date: Wed Dec  2 14:52:49 2009 New Revision: 886164 URL: http://svn.apache.org/viewvc?rev=886164view=rev Log: Fixup a blatant, flagrant, evil lie of the Devil found in the usage messages of 'svn update' and 'svn

Re: Trouble building JavaHL - ...ConflictDescriptor_Action.h not found

2009-12-02 Thread Hyrum K. Wright
On Dec 2, 2009, at 9:25 AM, Philip Martin wrote: Mark Phippard markp...@gmail.com writes: I am guessing that you are not using the Sun JDK? You pretty much need to have that. The open-source JDK's just do not cut it. I can build javahl on Debian using the openjdk-6-jdk package. I

Re: Trouble building JavaHL - ...ConflictDescriptor_Action.h not found

2009-12-02 Thread Mark Phippard
On Wed, Dec 2, 2009 at 7:25 AM, Philip Martin philip.mar...@wandisco.com wrote: Mark Phippard markp...@gmail.com writes: I am guessing that you are not using the Sun JDK?  You pretty much need to have that.  The open-source JDK's just do not cut it. I can build javahl on Debian using the

Re: Incubator status page

2009-12-02 Thread Bhuvaneswaran A
On Wed, 2009-12-02 at 09:23 -0600, Hyrum K. Wright wrote: I don't know where the right place to host the doxygen stuff on the ASF infrastructure is. I thought about setting up a cron job on people.apache.org and hosting it there, but doxygen isn't installed on that box, and I haven't done

Re: Incubator status page

2009-12-02 Thread Hyrum K. Wright
On Dec 2, 2009, at 10:15 AM, Bhuvaneswaran A wrote: On Wed, 2009-12-02 at 09:23 -0600, Hyrum K. Wright wrote: I don't know where the right place to host the doxygen stuff on the ASF infrastructure is. I thought about setting up a cron job on people.apache.org and hosting it there, but

Re: Incubator status page

2009-12-02 Thread C. Michael Pilato
Hyrum K. Wright wrote: On Dec 2, 2009, at 10:15 AM, Bhuvaneswaran A wrote: On Wed, 2009-12-02 at 09:23 -0600, Hyrum K. Wright wrote: I don't know where the right place to host the doxygen stuff on the ASF infrastructure is. I thought about setting up a cron job on people.apache.org and

Re: Trouble building JavaHL - ...ConflictDescriptor_Action.h not found

2009-12-02 Thread Hyrum K. Wright
On Dec 2, 2009, at 10:35 AM, Philip Martin wrote: Mark Phippard markp...@gmail.com writes: Also, the JavaHL tests require you to run make install install-javahl before they will run. I didn't know that, so I didn't do it. The tests still run :) Mark's statement isn't entirely true. I

Re: Incubator status page

2009-12-02 Thread Bhuvaneswaran A
On Wed, 2009-12-02 at 11:29 -0500, C. Michael Pilato wrote: I don't mind to setup crontab in here and make it permanent, let me know. Thanks! Thanks! This will work until we get official word on how Apache projects tend to do this type of thing. Where would we ask about it?

Re: Incubator status page

2009-12-02 Thread Bhuvaneswaran A
On Wed, 2009-12-02 at 10:25 -0600, Hyrum K. Wright wrote: Thanks! This will work until we get official word on how Apache projects tend to do this type of thing. Where would we ask about it? incubator-general? gene...@incubator.apache.org seem to be right place to ask about it. I'll

Re: svn commit: r886164 - in /subversion/trunk/subversion: svn/main.c tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout

2009-12-02 Thread C. Michael Pilato
C. Michael Pilato wrote: Paul Burba wrote: On Wed, Dec 2, 2009 at 9:52 AM, cmpil...@apache.org wrote: Author: cmpilato Date: Wed Dec 2 14:52:49 2009 New Revision: 886164 URL: http://svn.apache.org/viewvc?rev=886164view=rev Log: Fixup a blatant, flagrant, evil lie of the Devil found in

Re: Incubator status page

2009-12-02 Thread Bhuvaneswaran A
On Wed, 2009-12-02 at 10:49 -0600, Hyrum K. Wright wrote: On Dec 2, 2009, at 10:29 AM, C. Michael Pilato wrote: Hyrum K. Wright wrote: On Dec 2, 2009, at 10:15 AM, Bhuvaneswaran A wrote: On Wed, 2009-12-02 at 09:23 -0600, Hyrum K. Wright wrote: I don't know where the right place to

Re: svn commit: r886164 - in /subversion/trunk/subversion: svn/main.c tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout

2009-12-02 Thread David Glasser
On Wed, Dec 2, 2009 at 7:46 AM, Paul Burba ptbu...@gmail.com wrote: On Wed, Dec 2, 2009 at 9:52 AM,  cmpil...@apache.org wrote: Author: cmpilato Date: Wed Dec  2 14:52:49 2009 New Revision: 886164 URL: http://svn.apache.org/viewvc?rev=886164view=rev Log: Fixup a blatant, flagrant, evil lie

[PATCH] Fix javahl tests when builddir!=srcdir

2009-12-02 Thread Philip Martin
Philip Martin philip.mar...@wandisco.com writes: There was 1 error: 1) testLoadRepo(org.tigris.subversion.javahl.SVNAdminTests)java.io.FileNotFoundException: /home/pm/sw/subversion/obj/subversion/bindings/javahl/tests/data/issue2979.dump (No such file or directory) I'm not really a

Re: Incubator status page

2009-12-02 Thread C. Michael Pilato
Bhuvaneswaran A wrote: I was using doxygen 1.6.1 in people.apache.org. Possibly, Mike should upgrade doxygen in svn.collab.net? I've tried -- the dependency chain is too deep to fuss with for so very little benefit as it looks purtier. -- C. Michael Pilato cmpil...@collab.net CollabNet

Subversion 1.6.7 on Dec. 16.

2009-12-02 Thread Hyrum K. Wright
Hi all. Gather up your holiday cheer, for I would like to propose a gift to the Subversion user community: Subversion 1.6.7. I know that folks have been busy with the ASF transition as of late, but our users have been busy finding bugs and STATUS is getting pretty full. As a result, I'd like

Re: Incubator status page

2009-12-02 Thread Bhuvaneswaran A
On Wed, 2009-12-02 at 12:18 -0500, C. Michael Pilato wrote: Bhuvaneswaran A wrote: I was using doxygen 1.6.1 in people.apache.org. Possibly, Mike should upgrade doxygen in svn.collab.net? I've tried -- the dependency chain is too deep to fuss with for so very little benefit as it looks