Re: Error loading mod_dav_svn

2010-07-08 Thread Csaba Raduly
On Wed, Jul 7, 2010 at 7:54 PM, Itamar O  wrote:
 Hi list,

 I am administering the Subversion server on my organizational intranet,
(snip)
 when LoadModule ... modules/mod_dav_svn.so is in the configuration
 file, here's a snippet from the error log after a server restart:
 (of course the server is not started successfully after this)

 [Wed Jul 07 19:12:58 2010] [notice] Parent: Received restart signal --
 Restarting the server.
 [Wed Jul 07 19:12:58 2010] [notice] Child 3980: Exit event signaled.
 Child process is ending.
 httpd.exe: Syntax error on line 40 of C:/Program Files (x86)/Apache
 Software Foundation/Apache2.2/conf/httpd.conf: Cannot load C:/Program
 Files (x86)/Apache Software
 Foundation/Apache2.2/modules/mod_dav_svn.so into server: The specified
 module could not be found.

Get the dependency walker from http://www.dependencywalker.com/ and
try checking mod_dav_svn.so
It may be possible that mod_dav_svn is there but one of its
dependencies can not be found.

-- 
Life is complex, with real and imaginary parts.
Ok, it boots. Which means it must be bug-free and perfect.  -- Linus Torvalds
People disagree with me. I just ignore them. -- Linus Torvalds


Re: swapping the trunk and a branch

2010-07-08 Thread Ulrich Eckhardt
On Wednesday 07 July 2010, Cory Riddell wrote:
 My problem is that merges have been very problematic for me. They
 consistently fail due to running out of memory. I downloaded the
 64-bit client tools from SlikSVN and they will work if it is the
 only thing running. My machine is a 4 core machine with 4 GB of
 RAM and a 6 GB swap file (64-bit Windows 7). The merge takes a
 long time to complete and uses up almost all of the physical +
 virtual space.

 My svn client is version 1.6.12 (64-bit) and the server is 1.6.6
 (32-bit). The project has something like 2000 files.

I'm using TortoiseSVN here, on a dual-core machine with 1GiB of RAM, and I can 
perform merges on a similar-sized project without problems. It's not 
lightning fast, but I can still use other programs while the merge runs. The 
repository is served via svnserve in the LAN and hosted on a Debian/Linux 
machine.

Of course, the complexity (i.e. memory and time) for a merge operation 
increases with the number of revisions and the number of files, but a mere VS 
upgrade should only touch projectfiles and maybe a few sourcefiles, all of 
which are easy to merge and not too large.


That said, what we have here is sourcecode that compiles in parallel on VC6, 
VC7.1, VC8 and eVC4. All you have to take care of is that the directories for 
output and intermediate files (OutDir and IntDir) have an according tag so 
that they don't interfere with each other. That's completely off-topic for 
this list though

Cheers!

Uli

-- 
ML: http://subversion.tigris.org/mailing-list-guidelines.html
FAQ: http://subversion.tigris.org/faq.html
Docs: http://svnbook.red-bean.com/

Sator Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932

**
Sator Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
**
   Visit our website at http://www.satorlaser.de/
**
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten 
bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen 
Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein 
sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, 
weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte 
Änderungen enthalten. Sator Laser GmbH ist für diese Folgen nicht 
verantwortlich.
**



Accepting SSL certificates

2010-07-08 Thread Giulio Troccoli
I am trying to set Subversion to use https. I have already acquired a 
certificate from the company CA and set everything up in Apache.

If if use https the I am asked to accept that the certificate comes from a 
trusted authority. If I accept it everything works.

So, I have been instructed to download the company certificate and I'm trying 
to set it as a trusted CA. I have added the following to ~/.subversion/servers

ssl-authority-files = /home/svn/LDS.crt

It's not .pem, but I have been told that it is PEM-encoded. However, if I try 
with https I get the following error

svn: Invalid config: unable to load certificate file '/home/svn/LDS.crt'

I thought it was a permission issue but the file was readable by everyone, and 
the user who runs Apache is svn as well so Apache (if involved at all) can read 
it too.

The server is CentOS 5, SVN is 1.6.9 and Apache is 2.2.13.

Finally, I know I could accept it permanently but eventually I want to set the 
ssl-authority-files parameter on the system-wide subversion configuration so 
that all users automatically accept it.

Thanks
Giulio





Linedata Limited
Registered Office: 85 Gracechurch St., London, EC3V 0AA
Registered in England and Wales No 3475006 VAT Reg No 710 3140 03






clients not supporting http?

2010-07-08 Thread Jason Aubrey
Hi All,

I recently set up svn over http for a project I'm involved with. One
user made the following complaints:

(1) Some svn clients do not support the http protocol.  This
is a common occurrence when a user builds svn from source.

Because the svn transport svn:// is the standard,
internal transport for svn, every svn client should
support it.

(2) When i attempted to download a single-file,
svn complained that the file name was not a directory
name and rejected the request.

Is this true, that some svn clients do not support http?  This seems
unlikely to me. And I found
no examples when I searched google. I believe this user is on a Solaris
machine.

Also, should he be having trouble downloading a single file?  I can address
this second issue
with him - I primarily wanted to get the list's input on the first question.

Thanks very much,

Jason Aubrey


question about Tree conflict: local edit, incoming delete upon merge

2010-07-08 Thread emerson
Hi

I'm trying to apply a set of changes from our dev branch to our stable branch.
If I try to apply all changes at once I get a 21 tree conflics, so I'm
trying one by one, and committing at the end, so that I can be sure
I'm promoting the whole feature.

There is one specific revision that deletes a file.


emer...@emerson-desktop:~/workspace/branches/stable$ svn merge
http://subversion/svn/dotcom/trunk -c 80520

--- Merging r80520 into '.':
   C 
modules/com.yell.ucssearch/src/java/com/company/search/api/response/DoRetrieveNatAdFeed.java
Summary of conflicts:
  Tree conflicts: 1


if I check the status of the file it shows:

emer...@emerson-desktop:~/workspace/branches/stable$ svn status
modules/com.company.search/src/java/com/company/search/api/response/DoRetrieveNatAdFeed.java
  C 
modules/com.company.search/src/java/com/company/search/api/response/DoRetrieveNatAdFeed.java
 local edit, incoming delete upon merge

why is that? This is a simple delete , why does it show as a conflict?
the file hasn't changed by any other revision that is part of the
merge. Shouldn't it just remove the file locally or mark it for
deletion? Can't I apply several revisions to commit afterwards
together if one of them contains a deletion??

Could someone clarify this please?

Thanks
Emerson


Re: svn add: Unrecognized line ending style

2010-07-08 Thread Daniel Shahaf
Aaron Turner wrote on Wed, 7 Jul 2010 at 18:12 -:
 On Wed, Jul 7, 2010 at 12:34 AM, Johan Corveleyn jcor...@gmail.com wrote:
  On Wed, Jul 7, 2010 at 7:57 AM, Aaron Turner synfina...@gmail.com wrote:
  *.c = svn:eol-style=native, svn:keywords=Id HeadURL Author Rev Date
 
  Honestly, I'm 99.9% sure that this problem started after upgrading to
  1.6.12... nothing else changed that I can think of.
 
  I quickly checked the relevant section in the svn book:
 
  http://svnbook.red-bean.com/nightly/en/svn.advanced.confarea.html#svn.advanced.confarea.opts.config
 
  which says that multiple properties must by semi-colon-delimited (It
  contains any number of key-value pairs in the format PATTERN =
  PROPNAME=VALUE[;PROPNAME=VALUE ...]). In your config file it's
  comma-delimited, so maybe that's the problem. Maybe the parser of the
  autoprops was more tolerant before 1.6.12?
 
 
 Bingo. That was it.  Thanks for solving that mystery!
 

For the record, I can't reproduce it with trunk:

% svn add iota3 --config-option=config:auto-props:*.c=svn:eol-style=native, 
svn:keywords=Id
A iota3
%

 
 


Re: Performance of svn+ssh vs. file for multiple files

2010-07-08 Thread Daniel Shahaf
Eric Peers wrote on Wed, 7 Jul 2010 at 04:44 -:
 Incidentally, where is [svn_ra_reparent] defined??? I can't
 find it in the libraries, but I see it in libsvn_ra-1.so but not in the
 libsvn_ra directory...

% grep svn_ra_reparent tags
svn_ra_reparent ./subversion/include/svn_ra.h   
/^svn_ra_reparent(svn_ra_session_t *ra_session,$/; p   
signature:(svn_ra_session_t *ra_session, const char *url, apr_pool_t *pool)
svn_ra_reparent ./subversion/libsvn_ra/ra_loader.c  /^svn_error_t 
*svn_ra_reparent(svn_ra_session_t *session,$/;   f   
signature:(svn_ra_session_t *session, const char *url, apr_pool_t *pool)


To save you some work: you'll see it calls vtable-reparent().  So the
functions you *really* want are svn_ra__*_reparent():

% grep _reparent tags | awk '{print $1,$2}' | grep -v tools/server-side/
ra_svn_reparent ./subversion/libsvn_ra_svn/client.c
svn_log__reparent ./subversion/include/private/svn_log.h
svn_log__reparent ./subversion/libsvn_subr/log.c
svn_ra_local__reparent ./subversion/libsvn_ra_local/ra_plugin.c
svn_ra_neon__reparent ./subversion/libsvn_ra_neon/session.c
svn_ra_reparent ./subversion/include/svn_ra.h
svn_ra_reparent ./subversion/libsvn_ra/ra_loader.c
svn_ra_serf__reparent ./subversion/libsvn_ra_serf/serf.c
test_reparent ./subversion/bindings/swig/ruby/test/test_ra.rb



Re: question about Tree conflict: local edit, incoming delete upon merge

2010-07-08 Thread Olivier Sannier

emerson wrote:

emer...@emerson-desktop:~/workspace/branches/stable$ svn status
modules/com.company.search/src/java/com/company/search/api/response/DoRetrieveNatAdFeed.java
   C 
modules/com.company.search/src/java/com/company/search/api/response/DoRetrieveNatAdFeed.java
   local edit, incoming delete upon merge

why is that? This is a simple delete , why does it show as a conflict?
the file hasn't changed by any other revision that is part of the
merge. Shouldn't it just remove the file locally or mark it for
deletion? Can't I apply several revisions to commit afterwards
together if one of them contains a deletion??
   


The message says it all: You have a local (ie in trunk) modification 
while the merge tries to delete that modified files.
For you not to loose changes without knowing about it, SVN triggers a 
tree conflict. Only you, human, can decide what to do between keeping 
the file with the changes made in trunk, or accept the deletion that 
comes from the merge of the branch




Re: question about Tree conflict: local edit, incoming delete upon merge

2010-07-08 Thread Olivier Sannier
Between the time you created the branch and the time you merge it, the 
trunk has evolved and the file has been modified.

Use the log to see that.

Regards
Olivier

PS: Please reply to the list as well.

emerson wrote:

Hi Olivier

That is the thing, there is no changes done in that specific file!

I just did:
- revert that file
- update from svn, nothing to update
- merge that revision
- got conflict

One detail I left out: we are using 1.6 client and 1.4.4 server. Would
that be the reason of these type of conflicts?

Regards
Emerson
On 8 July 2010 12:34, Olivier Sannierobo...@free.fr  wrote:
   

emerson wrote:
 

emer...@emerson-desktop:~/workspace/branches/stable$ svn status

modules/com.company.search/src/java/com/company/search/api/response/DoRetrieveNatAdFeed.java
   C
modules/com.company.search/src/java/com/company/search/api/response/DoRetrieveNatAdFeed.java
 local edit, incoming delete upon merge

why is that? This is a simple delete , why does it show as a conflict?
the file hasn't changed by any other revision that is part of the
merge. Shouldn't it just remove the file locally or mark it for
deletion? Can't I apply several revisions to commit afterwards
together if one of them contains a deletion??

   

The message says it all: You have a local (ie in trunk) modification while
the merge tries to delete that modified files.
For you not to loose changes without knowing about it, SVN triggers a tree
conflict. Only you, human, can decide what to do between keeping the file
with the changes made in trunk, or accept the deletion that comes from the
merge of the branch


 


   




RE: Slow merging of selected revisions

2010-07-08 Thread Edward Ned Harvey
 From: emerson [mailto:echofloripa.y...@gmail.com]
 
 Even dry-run sometimes takes more than 30 minutes to process one single
 file.
 
 We are using the svn merge http://[repo] -c 333 command syntax.
 
 Our server is 1.4.4, and we are using 1.6.x clients.

I believe we found the root cause of this problem.  Please see this thread:
(start) http://svn.haxx.se/dev/archive-2010-07/0040.shtml
(middle) http://svn.haxx.se/dev/archive-2010-07/0101.shtml
(end) http://svn.haxx.se/dev/archive-2010-07/0122.shtml

The solution seems to be:

Upgrade your server to 1.6.
Upgrade your clients to 1.6.
and
Even though they say you shouldn't need this, dump  load your repo to
upgrade it to 1.6.  If you don't do this, the old revs which are slow in
your repo will always remain slow.  Moving forward, eventually you'll stop
seeing the problem on a regular basis, as you begin using more and more
consistently, just revs which were committed with 1.6.  But the commit
algorithm doesn't always diff against rev n-1, sometimes it diffs against
rev n/2, which means ...  Unless you do the dump  load, the problem will
never entirely go away.

The dump  load will take a really long time.  Because it will
systematically step on every single one of the bad revs.



Re: clients not supporting http?

2010-07-08 Thread Nico Kadel-Garcia
On Thu, Jul 8, 2010 at 7:05 AM, Jason Aubrey aubre...@gmail.com wrote:
 Hi All,

 I recently set up svn over http for a project I'm involved with. One
 user made the following complaints:

 (1) Some svn clients do not support the http protocol.  This
 is a common occurrence when a user builds svn from source.

 Because the svn transport svn:// is the standard,
 internal transport for svn, every svn client should
 support it.

Yup: if you don't have the HTTPD or Apache include files installed,
known as the httpd-devel package under RPM based Linux distributions
like RedHat and Fedora, you can't build the relevant software because
you lack the compilation tools. The ./configure script detects this
and disables the relevant features.


 (2) When i attempted to download a single-file,
 svn complained that the file name was not a directory
 name and rejected the request.

You can't check out a single file, You can download it with the
export command, or a simple wget.

 Is this true, that some svn clients do not support http?  This seems
 unlikely to me. And I found
 no examples when I searched google. I believe this user is on a Solaris
 machine.

 Also, should he be having trouble downloading a single file?  I can address
 this second issue
 with him - I primarily wanted to get the list's input on the first question.

 Thanks very much,

 Jason Aubrey


He's probably trying to check it out, not download it. Checkouts
create that .svn subdirectory, with its attached information about
the other contents of the directory.


Re: SVN Apache Installation

2010-07-08 Thread Nico Kadel-Garcia
On Wed, Jul 7, 2010 at 4:40 PM, Ryan Schmidt
subversion-20...@ryandesign.com wrote:

 On Jul 7, 2010, at 11:49, Andy Levy wrote:

 The Subversion modules for Apache require Apache 2.2.x, so you will
 need to upgrade or install 2.2 in parallel with 2.0.63.

 Did that change recently? I know Subversion used to compile just fine with 
 Apache 2.0.x or 2.2.x and that there were binaries posted for both. But I 
 can't find those now.

Compiling Subversion just fine on legacy operating systems is
painful, inlcluding RHEL 4 (which contained httpd-2.0.63). The
dependencies on more recent versions of Python, neon, and SQlite are
awkward to mange.

If possible, update to RHEL 5 or CentOS 5 and grab the RPMforge
release of subversion-1.6.12. You'll save yourself a lot of pain: I
found backporting to RHEL 4 to be a big problem and gave it up as too
tough to provide a completely workable install, especially for x86_64,
years ago.


AW: AW: merging executable binaries

2010-07-08 Thread Matthias Weyh
It seems that there is already a report present at
http://subversion.tigris.org/issues/show_bug.cgi?id=3475 for this issue.
The revision for the fix however seems to not match the revision on
http://svn.apache.org/repos/asf/.

Can you tell me how to find out what was changed and if the patch is
already included in one of the later subversion releases?

Thanks,
Matthias

-Ursprüngliche Nachricht-
Von: Daniel Shahaf [mailto:d...@daniel.shahaf.name] 
Gesendet: Donnerstag, 8. Juli 2010 10:33
An: Matthias Weyh
Cc: users@subversion.apache.org
Betreff: Re: AW: merging executable binaries

Matthias Weyh wrote on Wed, 7 Jul 2010 at 09:15 -:
 Hello,
 
 I have added a command list for reproducing the issue.
 

Thank you.  It's much easier to understand the situation now.

 Please note the last commit message. At this point the executable flag
 is missing. It is however recovered on the commit.
 

I've read the transcript and I agree it's a bug.

Please go ahead and file a bug report at
http://subversion.tigris.org/issues/, 
so that we don't forget about it.  If you'd like to dive in and help fix
it, 
that's more than okay :-)

 best regards,
 Matthias
 

Daniel

 
 $ svnadmin create /a/svnserver
 
 $ svn checkout file:///a/svnserver /a/wc
 Checked out revision 0.
 
 $ cd /a/wc
 
 $ mkdir trunk
 
 $ mkdir branches
 
 $ mkdir tags
 
 $ svn add trunk tags branches
 A trunk
 A tags
 A branches
 
 $ svn commit -m initial structure
 Adding branches
 Adding tags
 Adding trunk
 
 Committed revision 1.
 
 $ svn switch file:///a/svnserver/trunk
 Dtrunk
 Dbranches
 Dtags
 Updated to revision 1.
 
 $ dd if=/dev/urandom of=executable.bin bs=1k count=1
 1+0 records in
 1+0 records out
 1024 bytes (1.0 kB) copied, 0.000298366 s, 3.4 MB/s
 
 $ ls -la
 total 16
 drwxr-xr-x  3 devtsd devtsd 4096 2010-07-07 07:58 .
 drwxr-xr-x 12 devtsd devtsd 4096 2010-07-07 07:56 ..
 -rw-r--r--  1 devtsd devtsd 1024 2010-07-07 07:58 executable.bin
 drwxr-xr-x  6 devtsd devtsd 4096 2010-07-07 07:57 .svn
 
 $ svn propset svn:executable ON executable.bin 
 property 'svn:executable' set on 'executable.bin'
 
 $ ls -la
 total 16
 drwxr-xr-x  3 devtsd devtsd 4096 2010-07-07 07:58 .
 drwxr-xr-x 12 devtsd devtsd 4096 2010-07-07 07:56 ..
 -rwxr-xr-x  1 devtsd devtsd 1024 2010-07-07 07:58 executable.bin
 drwxr-xr-x  6 devtsd devtsd 4096 2010-07-07 08:02 .svn
 
 $ svn commit -m executable added
 Adding  (bin)  executable.bin
 Transmitting file data .
 Committed revision 2.
 
 $ svn copy file:///a/svnserver/trunk file:///a/svnserver/branches/b1 -
 created branch b1
 
 Committed revision 3.
 
 $ dd if=/dev/urandom of=executable.bin bs=1k count=1
 1+0 records in
 1+0 records out
 1024 bytes (1.0 kB) copied, 0.000177119 s, 5.8 MB/s
 
 $ ls -la
 total 16
 drwxr-xr-x  3 devtsd devtsd 4096 2010-07-07 08:04 .
 drwxr-xr-x 12 devtsd devtsd 4096 2010-07-07 07:56 ..
 -rwxr-xr-x  1 devtsd devtsd 1024 2010-07-07 08:04 executable.bin
 drwxr-xr-x  6 devtsd devtsd 4096 2010-07-07 08:02 .svn
 
 $ svn commit -m executable modified
 Sendingexecutable.bin
 Transmitting file data .
 Committed revision 4.
 
 $ svn switch file:///a/svnserver/branches/b1
 Uexecutable.bin
 Updated to revision 4.
 
 $ ls -la
 total 16
 drwxr-xr-x  3 devtsd devtsd 4096 2010-07-07 08:06 .
 drwxr-xr-x 12 devtsd devtsd 4096 2010-07-07 07:56 ..
 -rwxr-xr-x  1 devtsd devtsd 1024 2010-07-07 08:06 executable.bin
 drwxr-xr-x  6 devtsd devtsd 4096 2010-07-07 08:06 .svn
 
 $ svn merge file:///a/svnserver/trunk -r 3:4
 --- Merging r4 into '.':
 Uexecutable.bin
 
 $ ls -la
 total 16
 drwxr-xr-x  3 devtsd devtsd 4096 2010-07-07 08:07 .
 drwxr-xr-x 12 devtsd devtsd 4096 2010-07-07 07:56 ..
 -rw-r--r--  1 devtsd devtsd 1024 2010-07-07 08:07 executable.bin
 drwxr-xr-x  6 devtsd devtsd 4096 2010-07-07 08:07 .svn
 
 $ svn commit -m executable now has no execute flag which it should
but
 this will change with the commit
 Sending.
 Sendingexecutable.bin
 Transmitting file data .
 Committed revision 5.
 
 $ ls -la
 total 16
 drwxr-xr-x  3 devtsd devtsd 4096 2010-07-07 08:07 .
 drwxr-xr-x 12 devtsd devtsd 4096 2010-07-07 07:56 ..
 -rwxr-xr-x  1 devtsd devtsd 1024 2010-07-07 08:07 executable.bin
 drwxr-xr-x  6 devtsd devtsd 4096 2010-07-07 08:07 .svn
 
 
 -Ursprüngliche Nachricht-
 Von: Daniel Shahaf [mailto:d...@daniel.shahaf.name] 
 Gesendet: Dienstag, 6. Juli 2010 20:35
 An: Matthias Weyh
 Cc: users@subversion.apache.org
 Betreff: Re: merging executable binaries
 
 It's not clear to me exactly what you did.  (The most unambiguous way
to
 explain yourself is to post a list of commands, starting from
'svnadmin
 create'.)  However, if you run 'svn merge' and at the end of the
 operation a file has svn:executable set, then its +x permission should
 be set --- and if not, that's a bug.
 
 Matthias Weyh wrote on Mon, 5 Jul 2010 at 15:54 -:
  Hello,
  
  I have seen the following behaviour.
  
  added binary file to 

Re: Accepting SSL certificates

2010-07-08 Thread Boris Epstein
On Thu, Jul 8, 2010 at 5:37 AM, Giulio Troccoli
giulio.trocc...@uk.linedata.com wrote:

 I am trying to set Subversion to use https. I have already acquired a 
 certificate from the company CA and set everything up in Apache.

 If if use https the I am asked to accept that the certificate comes from a 
 trusted authority. If I accept it everything works.

 So, I have been instructed to download the company certificate and I'm trying 
 to set it as a trusted CA. I have added the following to ~/.subversion/servers

 ssl-authority-files = /home/svn/LDS.crt

 It's not .pem, but I have been told that it is PEM-encoded. However, if I try 
 with https I get the following error

 svn: Invalid config: unable to load certificate file '/home/svn/LDS.crt'

 I thought it was a permission issue but the file was readable by everyone, 
 and the user who runs Apache is svn as well so Apache (if involved at all) 
 can read it too.

 The server is CentOS 5, SVN is 1.6.9 and Apache is 2.2.13.

 Finally, I know I could accept it permanently but eventually I want to set 
 the ssl-authority-files parameter on the system-wide subversion configuration 
 so that all users automatically accept it.

 Thanks
 Giulio





 Linedata Limited
 Registered Office: 85 Gracechurch St., London, EC3V 0AA
 Registered in England and Wales No 3475006 VAT Reg No 710 3140 03





Guido,

I remember dealing with it - and I think it is normal that a user has
to accept the certificate once. I may be wrong but I thinkl this may
be by design.

Boris.


installing subversion with Oracle Weblogic Application Sever 11g

2010-07-08 Thread Birdsell, John - OIG
We are preparing to build out a new application server - oracle weblogic
App server 11g and we want to include subversion 1.6 .  Has anyone done
this ?  Any articles available ?  gotcha's to look out for?

 

Thanks

 

 

John Birdsell

 

IT Specialist 

US Dept of Labor

Office of Inspector General

200 Constitution Ave, NW

Room S5020

Washington, DC 20210

 

(202) 693-7055 

 

birdsell.j...@oig.dol.gov mailto:birdsell.j...@oig.dol.gov 

 



Re: question about Tree conflict: local edit, incoming delete upon merge

2010-07-08 Thread emerson
Ops, missed the reply-all.

That specific file hasn't changed since the branch was created, still
I got the tree conflict when it was deleted in svn.

And for other files that I get tree conflict, they had been added and
changed in previous revisions, but all of them had been merged
locally.

So...  we are using 1.6 client and 1.4.4 server. Would
that be the reason of these type of conflicts?

On 8 July 2010 12:54, Olivier Sannier obo...@free.fr wrote:
 Between the time you created the branch and the time you merge it, the trunk
 has evolved and the file has been modified.
 Use the log to see that.

 Regards
 Olivier

 PS: Please reply to the list as well.

 emerson wrote:

 Hi Olivier

 That is the thing, there is no changes done in that specific file!

 I just did:
 - revert that file
 - update from svn, nothing to update
 - merge that revision
 - got conflict

 One detail I left out: we are using 1.6 client and 1.4.4 server. Would
 that be the reason of these type of conflicts?

 Regards
 Emerson
 On 8 July 2010 12:34, Olivier Sannierobo...@free.fr  wrote:


 emerson wrote:


 emer...@emerson-desktop:~/workspace/branches/stable$ svn status


 modules/com.company.search/src/java/com/company/search/api/response/DoRetrieveNatAdFeed.java
       C

 modules/com.company.search/src/java/com/company/search/api/response/DoRetrieveNatAdFeed.java
             local edit, incoming delete upon merge

 why is that? This is a simple delete , why does it show as a conflict?
 the file hasn't changed by any other revision that is part of the
 merge. Shouldn't it just remove the file locally or mark it for
 deletion? Can't I apply several revisions to commit afterwards
 together if one of them contains a deletion??



 The message says it all: You have a local (ie in trunk) modification
 while
 the merge tries to delete that modified files.
 For you not to loose changes without knowing about it, SVN triggers a
 tree
 conflict. Only you, human, can decide what to do between keeping the file
 with the changes made in trunk, or accept the deletion that comes from
 the
 merge of the branch









Re: svn add: Unrecognized line ending style

2010-07-08 Thread Stefan Sperling
On Thu, Jul 08, 2010 at 11:22:18AM +0300, Daniel Shahaf wrote:
 For the record, I can't reproduce it with trunk:
 
 % svn add iota3 --config-option=config:auto-props:*.c=svn:eol-style=native, 
 svn:keywords=Id
 A iota3
 %

And what do the resulting properties look like?

Stefan


Re: clients not supporting http?

2010-07-08 Thread Mark Phippard
On Thu, Jul 8, 2010 at 7:05 AM, Jason Aubrey aubre...@gmail.com wrote:

 Is this true, that some svn clients do not support http?  This seems
 unlikely to me. And I found
 no examples when I searched google. I believe this user is on a Solaris
 machine.

Subversion requires either the Neon or Serf libraries to provide HTTP
support.  If you do not build with these libraries then you do not
have HTTP client support.  I would not say this is common as almost
all Subversion repositories are available only by HTTP.

Your user should either compile their Subversion client with all of
the proper dependencies or download a binary version.  There are a
number of places where you can get precompiled versions of Subversion
for Solaris.

http://subversion.apache.org/packages.html#solaris


-- 
Thanks

Mark Phippard
http://markphip.blogspot.com/


Re: clients not supporting http?

2010-07-08 Thread Campbell Allan

On Thursday 08 Jul 2010, Nico Kadel-Garcia wrote:
 On Thu, Jul 8, 2010 at 7:05 AM, Jason Aubrey aubre...@gmail.com wrote:
  Hi All,
 
  I recently set up svn over http for a project I'm involved with. One
  user made the following complaints:
 
  (1) Some svn clients do not support the http protocol.  This
  is a common occurrence when a user builds svn from source.
 
  Because the svn transport svn:// is the standard,
  internal transport for svn, every svn client should
  support it.

 Yup: if you don't have the HTTPD or Apache include files installed,
 known as the httpd-devel package under RPM based Linux distributions
 like RedHat and Fedora, you can't build the relevant software because
 you lack the compilation tools. The ./configure script detects this
 and disables the relevant features.


Are you certain about that? Neon or serf provide the client with http support 
and are both in the subversion-deps source tarball. I'm fairly sure all the 
machines I've compiled on have never had the httpd-devel like packages 
installed (or in some cases any dev packages beyond the compiler). https 
support can be tricky as this will require either the openssl dev package to 
be installed or a local build handy.

I had to ask a friend, it seems on opensolaris it's a pretty ancient version 
of subversion provided in the packages (1.4ish) so it sounds like the user in 
question might have compiled his/her own.

  (2) When i attempted to download a single-file,
  svn complained that the file name was not a directory
  name and rejected the request.

 You can't check out a single file, You can download it with the
 export command, or a simple wget.

  Is this true, that some svn clients do not support http?  This seems
  unlikely to me. And I found
  no examples when I searched google. I believe this user is on a Solaris
  machine.
 
  Also, should he be having trouble downloading a single file?  I can
  address this second issue
  with him - I primarily wanted to get the list's input on the first
  question.
 
  Thanks very much,
 
  Jason Aubrey

 He's probably trying to check it out, not download it. Checkouts
 create that .svn subdirectory, with its attached information about
 the other contents of the directory.

Campbell
-- 

__
Sword Ciboodle is the trading name of ciboodle Limited (a company 
registered in Scotland with registered number SC143434 and whose 
registered office is at India of Inchinnan, Renfrewshire, UK, 
PA4 9LH) which is part of the Sword Group of companies.

This email (and any attachments) is intended for the named
recipient(s) and is private and confidential. If it is not for you, 
please inform us and then delete it. If you are not the intended 
recipient(s), the use, disclosure, copying or distribution of any 
information contained within this email is prohibited. Messages to 
and from us may be monitored. If the content is not about the 
business of the Sword Group then the message is neither from nor 
sanctioned by us.

Internet communications are not secure. You should scan this
message and any attachments for viruses. Under no circumstances
do we accept liability for any loss or damage which may result from
your receipt of this email or any attachment.
__



Re: 'File not found' error during svnsync

2010-07-08 Thread Juan Wajnerman
I tried the patch but unfortunately is not working for me.
I'll try to reproduce the error in a smaller repository.

What I don't understand is if the problematic revision is the 1306 or 1307.
The error message reefers to 1306 but I can see in the logs of the synced
repository that the 1306 revision seems to be already imported. On the other 
hand,
the revision 1307 is a large merge that looks much more suspicious to me.
Is the revision number displayed during the sync zero based? Or is the synced 
repository
in an inconsistent state?

On Jul 6, 2010, at 3:32 PM, Daniel Shahaf wrote:

 Juan Wajnerman wrote on Mon, 5 Jul 2010 at 18:13 -:
 I'm trying to perform a svnsync with a repo stored at Google Code but
 it always fails at certain revision with the following error:
 
 $ svnsync sync file:///~/Riff Transmitting file data
 ...svnsync: File not found: transaction '1306-10e', path
 '/trunk/Modules/ReadUnread/Source/ReadUnread.Web/Controllers/ReadUnreadController.cs'
 
 To reproduce this error, just try the same svnsync with the repo
 located at http://riff-evolve.googlecode.com/svn.
 
 I found a similar issue in the bug database
 (http://subversion.tigris.org/issues/show_bug.cgi?id=3641) but
 I cannot see the reason described there matches with my case. What
 I can see as suspicious is that in the problematic revision a branch
 is created with the same name as an old branch that was deleted in
 a previous changeset.
 
 
 The patch I posted to #3641 handles the case of replaces (i.e., a remove 
 and an add-with-history of a path in the same revision).  This same name 
 as an old branch issue, therefore, rings a bell...  Can you try that patch?
 
 Alternatively, it would probably be helpful if you could come up with a 
 smaller reproduction repository (i.e., one that uses fewer than 1300 
 revisions, and modifies few files in each revision).  Can you narrow the 
 problem down?
 
 I'm currently using Subversion 1.6.5 (r38866) with Mac OSX 10.6.4.
 
 Any hint will be appreciated, even a workaround to this problem.
 
 Thanks, - Juan
 
 
 
 
 



Re: installing subversion with Oracle Weblogic Application Sever 11g

2010-07-08 Thread Campbell Allan

On Thursday 08 Jul 2010, Birdsell, John - OIG wrote:
 We are preparing to build out a new application server - oracle weblogic
 App server 11g and we want to include subversion 1.6 .  Has anyone done
 this ?  Any articles available ?  gotcha's to look out for?



 Thanks





 John Birdsell


I'm not sure what you are asking when you say include subversion 1.6. In loose 
terms, WebLogic is a J2EE application server for running java applications 
and is completely independent from version control systems such as 
Subversion. Do you in what way the two would interact as there are a few 
possible combinations? Are you meaning you want to host a Subversion 
repository (via http?) running at the same time as WebLogic or from WebLogic? 
Or do you want to access a repository from an application installed in 
Weblogic? Or are you putting some of welogics files under version control?

oh, just thought of another possibility, Weblogic might come with a 
development environment which if it hasn't changed from 10 is based upon 
Eclipse. If you are meaning that then no, there won't be any gotchas but you 
will need to install a compatible plugin if you wish to use subversion from 
within the Eclipse tooling.

Campbell
__
Sword Ciboodle is the trading name of ciboodle Limited (a company 
registered in Scotland with registered number SC143434 and whose 
registered office is at India of Inchinnan, Renfrewshire, UK, 
PA4 9LH) which is part of the Sword Group of companies.

This email (and any attachments) is intended for the named
recipient(s) and is private and confidential. If it is not for you, 
please inform us and then delete it. If you are not the intended 
recipient(s), the use, disclosure, copying or distribution of any 
information contained within this email is prohibited. Messages to 
and from us may be monitored. If the content is not about the 
business of the Sword Group then the message is neither from nor 
sanctioned by us.

Internet communications are not secure. You should scan this
message and any attachments for viruses. Under no circumstances
do we accept liability for any loss or damage which may result from
your receipt of this email or any attachment.
__



Re: swapping the trunk and a branch

2010-07-08 Thread Cory Riddell
On 7/8/2010 3:59 AM, Ulrich Eckhardt wrote:

 Of course, the complexity (i.e. memory and time) for a merge operation 
 increases with the number of revisions and the number of files, but a mere VS 
 upgrade should only touch projectfiles and maybe a few sourcefiles, all of 
 which are easy to merge and not too large.
   

The repository has history going back more than 10 years. Lots of revisions.
The VS upgrade really didn't alter the contents of very many files. I'm
thinking the problem is coming from merging trunk-branch. This seems to
touch the properties of every single file in the repository and I'm
speculating that's what is eating up 8 GB of memory. If I understand
this correctly, subversion is adding metadata so it knows what revisions
to merge next time I push changes from my trunk to branch.

 That said, what we have here is sourcecode that compiles in parallel on VC6, 
 VC7.1, VC8 and eVC4. All you have to take care of is that the directories for 
 output and intermediate files (OutDir and IntDir) have an according tag so 
 that they don't interfere with each other. That's completely off-topic for 
 this list though...

It's offtopic, but still interesting to me. If I had to maintain
multiple versions of the project files, I would probably start looking
at something like CMake to generate the project and solution files.
Without that, it seems very error prone to have to remember to update
each version of the project file with every change.

My other problem is that our project relies on a rather large third
party library. We have the include and lib files as a subproject living
under the solution dir. I don't want the merge to recurse into this one
directory:
  + Main Solution Dir
  - sub project 1
  - sub project 2
  - 3rd party project
I've thought about moving the 3rd party project directory to a different
place in the repository and using an external directive, but I'm really
trying to avoid using them. They're evil, right? The other fix I've
thought about is having multiple 3rd party projects.
  + Main Solution Dir
  - sub project 1
  - sub project 2
  - 3rd party project VS2008
  - 3rd party project VS2010

Cory



RE: Accepting SSL certificates

2010-07-08 Thread Giulio Troccoli



Linedata Limited
Registered Office: 85 Gracechurch St., London, EC3V 0AA
Registered in England and Wales No 3475006 VAT Reg No 710 3140 03

-Original Message-


 From: Boris Epstein [mailto:borepst...@gmail.com]
 Sent: 08 July 2010 13:28
 To: Giulio Troccoli
 Cc: users@subversion.apache.org
 Subject: Re: Accepting SSL certificates

 On Thu, Jul 8, 2010 at 5:37 AM, Giulio Troccoli
 giulio.trocc...@uk.linedata.com wrote:
 
  I am trying to set Subversion to use https. I have already
 acquired a certificate from the company CA and set everything
 up in Apache.
 
  If if use https the I am asked to accept that the
 certificate comes from a trusted authority. If I accept it
 everything works.
 
  So, I have been instructed to download the company
 certificate and I'm
  trying to set it as a trusted CA. I have added the following to
  ~/.subversion/servers
 
  ssl-authority-files = /home/svn/LDS.crt
 
  It's not .pem, but I have been told that it is PEM-encoded.
 However,
  if I try with https I get the following error
 
  svn: Invalid config: unable to load certificate file
 '/home/svn/LDS.crt'
 
  I thought it was a permission issue but the file was
 readable by everyone, and the user who runs Apache is svn as
 well so Apache (if involved at all) can read it too.
 
  The server is CentOS 5, SVN is 1.6.9 and Apache is 2.2.13.
 
  Finally, I know I could accept it permanently but
 eventually I want to set the ssl-authority-files parameter on
 the system-wide subversion configuration so that all users
 automatically accept it.
 
  Thanks
  Giulio

 I remember dealing with it - and I think it is normal that a
 user has to accept the certificate once. I may be wrong but I
 thinkl this may be by design.

 Boris.

Thanks Boris, but apparently it was not a PEM-encoded certificate gr

Anyway, after I got the right certificate (and I fix some other little things) 
it works.

So, if anyone is reading this from the archive, ssl-authority-files works just 
as expected.

Giulio


Re: svn add: Unrecognized line ending style

2010-07-08 Thread Aaron Turner
On Thu, Jul 8, 2010 at 1:22 AM, Daniel Shahaf d...@daniel.shahaf.name wrote:
 Aaron Turner wrote on Wed, 7 Jul 2010 at 18:12 -:
 On Wed, Jul 7, 2010 at 12:34 AM, Johan Corveleyn jcor...@gmail.com wrote:
  On Wed, Jul 7, 2010 at 7:57 AM, Aaron Turner synfina...@gmail.com wrote:
  *.c = svn:eol-style=native, svn:keywords=Id HeadURL Author Rev Date
 
  Honestly, I'm 99.9% sure that this problem started after upgrading to
  1.6.12... nothing else changed that I can think of.
 
  I quickly checked the relevant section in the svn book:
 
  http://svnbook.red-bean.com/nightly/en/svn.advanced.confarea.html#svn.advanced.confarea.opts.config
 
  which says that multiple properties must by semi-colon-delimited (It
  contains any number of key-value pairs in the format PATTERN =
  PROPNAME=VALUE[;PROPNAME=VALUE ...]). In your config file it's
  comma-delimited, so maybe that's the problem. Maybe the parser of the
  autoprops was more tolerant before 1.6.12?


 Bingo. That was it.  Thanks for solving that mystery!


 For the record, I can't reproduce it with trunk:

 % svn add iota3 --config-option=config:auto-props:*.c=svn:eol-style=native, 
 svn:keywords=Id
 A         iota3
 %

You need to add a .c file :)  It only breaks if the filename matches the rule.

-- 
Aaron Turner
http://synfin.net/ Twitter: @synfinatic
http://tcpreplay.synfin.net/ - Pcap editing and replay tools for Unix  Windows
Those who would give up essential Liberty, to purchase a little temporary
Safety, deserve neither Liberty nor Safety.
-- Benjamin Franklin
carpe diem quam minimum credula postero


Re: AW: merging executable binaries

2010-07-08 Thread Tyler Colgan
The short explanation for the wrong rev number is that you have to add
840074 to it first. The long explanation can be found at
http://svn.apache.org/repos/asf/subversion/README.

Issue 3475 appears to have been for svn patch rather than svn
merge, but it's more or less the same problem. It looks like this is
the diff that fixed the issue for svn patch:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/patch.c?r1=879495r2=879496pathrev=879496
Something similar would probably fix the problem for svn merge as well.

Tyler

On Thu, Jul 8, 2010 at 8:21 AM, Matthias Weyh m.w...@technisat.de wrote:
 It seems that there is already a report present at
 http://subversion.tigris.org/issues/show_bug.cgi?id=3475 for this issue.
 The revision for the fix however seems to not match the revision on
 http://svn.apache.org/repos/asf/.

 Can you tell me how to find out what was changed and if the patch is
 already included in one of the later subversion releases?

 Thanks,
 Matthias

 -Ursprüngliche Nachricht-
 Von: Daniel Shahaf [mailto:d...@daniel.shahaf.name]
 Gesendet: Donnerstag, 8. Juli 2010 10:33
 An: Matthias Weyh
 Cc: users@subversion.apache.org
 Betreff: Re: AW: merging executable binaries

 Matthias Weyh wrote on Wed, 7 Jul 2010 at 09:15 -:
 Hello,

 I have added a command list for reproducing the issue.


 Thank you.  It's much easier to understand the situation now.

 Please note the last commit message. At this point the executable flag
 is missing. It is however recovered on the commit.


 I've read the transcript and I agree it's a bug.

 Please go ahead and file a bug report at
 http://subversion.tigris.org/issues/,
 so that we don't forget about it.  If you'd like to dive in and help fix
 it,
 that's more than okay :-)

 best regards,
 Matthias


 Daniel


 $ svnadmin create /a/svnserver

 $ svn checkout file:///a/svnserver /a/wc
 Checked out revision 0.

 $ cd /a/wc

 $ mkdir trunk

 $ mkdir branches

 $ mkdir tags

 $ svn add trunk tags branches
 A         trunk
 A         tags
 A         branches

 $ svn commit -m initial structure
 Adding         branches
 Adding         tags
 Adding         trunk

 Committed revision 1.

 $ svn switch file:///a/svnserver/trunk
 D    trunk
 D    branches
 D    tags
 Updated to revision 1.

 $ dd if=/dev/urandom of=executable.bin bs=1k count=1
 1+0 records in
 1+0 records out
 1024 bytes (1.0 kB) copied, 0.000298366 s, 3.4 MB/s

 $ ls -la
 total 16
 drwxr-xr-x  3 devtsd devtsd 4096 2010-07-07 07:58 .
 drwxr-xr-x 12 devtsd devtsd 4096 2010-07-07 07:56 ..
 -rw-r--r--  1 devtsd devtsd 1024 2010-07-07 07:58 executable.bin
 drwxr-xr-x  6 devtsd devtsd 4096 2010-07-07 07:57 .svn

 $ svn propset svn:executable ON executable.bin
 property 'svn:executable' set on 'executable.bin'

 $ ls -la
 total 16
 drwxr-xr-x  3 devtsd devtsd 4096 2010-07-07 07:58 .
 drwxr-xr-x 12 devtsd devtsd 4096 2010-07-07 07:56 ..
 -rwxr-xr-x  1 devtsd devtsd 1024 2010-07-07 07:58 executable.bin
 drwxr-xr-x  6 devtsd devtsd 4096 2010-07-07 08:02 .svn

 $ svn commit -m executable added
 Adding  (bin)  executable.bin
 Transmitting file data .
 Committed revision 2.

 $ svn copy file:///a/svnserver/trunk file:///a/svnserver/branches/b1 -
 created branch b1

 Committed revision 3.

 $ dd if=/dev/urandom of=executable.bin bs=1k count=1
 1+0 records in
 1+0 records out
 1024 bytes (1.0 kB) copied, 0.000177119 s, 5.8 MB/s

 $ ls -la
 total 16
 drwxr-xr-x  3 devtsd devtsd 4096 2010-07-07 08:04 .
 drwxr-xr-x 12 devtsd devtsd 4096 2010-07-07 07:56 ..
 -rwxr-xr-x  1 devtsd devtsd 1024 2010-07-07 08:04 executable.bin
 drwxr-xr-x  6 devtsd devtsd 4096 2010-07-07 08:02 .svn

 $ svn commit -m executable modified
 Sending        executable.bin
 Transmitting file data .
 Committed revision 4.

 $ svn switch file:///a/svnserver/branches/b1
 U    executable.bin
 Updated to revision 4.

 $ ls -la
 total 16
 drwxr-xr-x  3 devtsd devtsd 4096 2010-07-07 08:06 .
 drwxr-xr-x 12 devtsd devtsd 4096 2010-07-07 07:56 ..
 -rwxr-xr-x  1 devtsd devtsd 1024 2010-07-07 08:06 executable.bin
 drwxr-xr-x  6 devtsd devtsd 4096 2010-07-07 08:06 .svn

 $ svn merge file:///a/svnserver/trunk -r 3:4
 --- Merging r4 into '.':
 U    executable.bin

 $ ls -la
 total 16
 drwxr-xr-x  3 devtsd devtsd 4096 2010-07-07 08:07 .
 drwxr-xr-x 12 devtsd devtsd 4096 2010-07-07 07:56 ..
 -rw-r--r--  1 devtsd devtsd 1024 2010-07-07 08:07 executable.bin
 drwxr-xr-x  6 devtsd devtsd 4096 2010-07-07 08:07 .svn

 $ svn commit -m executable now has no execute flag which it should
 but
 this will change with the commit
 Sending        .
 Sending        executable.bin
 Transmitting file data .
 Committed revision 5.

 $ ls -la
 total 16
 drwxr-xr-x  3 devtsd devtsd 4096 2010-07-07 08:07 .
 drwxr-xr-x 12 devtsd devtsd 4096 2010-07-07 07:56 ..
 -rwxr-xr-x  1 devtsd devtsd 1024 2010-07-07 08:07 executable.bin
 drwxr-xr-x  6 devtsd devtsd 4096 2010-07-07 08:07 .svn


 -Ursprüngliche Nachricht-
 Von: Daniel Shahaf 

Re: Performance of svn+ssh vs. file for multiple files

2010-07-08 Thread Eric Peers



On 07/08/2010 02:27 AM, Daniel Shahaf wrote:

Eric Peers wrote on Wed, 7 Jul 2010 at 04:44 -:
   

Incidentally, where is [svn_ra_reparent] defined??? I can't
find it in the libraries, but I see it in libsvn_ra-1.so but not in the
libsvn_ra directory...
 

% grep svn_ra_reparent tags
svn_ra_reparent ./subversion/include/svn_ra.h   /^svn_ra_reparent(svn_ra_session_t 
*ra_session,$/; p   signature:(svn_ra_session_t *ra_session, const 
char *url, apr_pool_t *pool)
svn_ra_reparent ./subversion/libsvn_ra/ra_loader.c  /^svn_error_t 
*svn_ra_reparent(svn_ra_session_t *session,$/;   f   
signature:(svn_ra_session_t *session, const char *url, apr_pool_t *pool)


To save you some work: you'll see it calls vtable-reparent().  So the
functions you *really* want are svn_ra__*_reparent():

% grep _reparent tags | awk '{print $1,$2}' | grep -v tools/server-side/
ra_svn_reparent ./subversion/libsvn_ra_svn/client.c
svn_log__reparent ./subversion/include/private/svn_log.h
svn_log__reparent ./subversion/libsvn_subr/log.c
svn_ra_local__reparent ./subversion/libsvn_ra_local/ra_plugin.c
svn_ra_neon__reparent ./subversion/libsvn_ra_neon/session.c
svn_ra_reparent ./subversion/include/svn_ra.h
svn_ra_reparent ./subversion/libsvn_ra/ra_loader.c
svn_ra_serf__reparent ./subversion/libsvn_ra_serf/serf.c
test_reparent ./subversion/bindings/swig/ruby/test/test_ra.rb

   



I ended up writing a routine that uses the reparent call as previously 
discussed with a minor rework of the svn_client__update_internal to 
accomodate this. Overall time to update: 3.09s rather than 53s 
originally by reusing the session. Once I polish up the code, I'll post 
a copy on my blog if anybody wants it.


This is well within acceptable ranges for performance in my mind.

@Les: tags/branches don't work in this case because an edit on this can 
change the tag/branch and because the merge of local edits + local 
version changes becomes cumbersome (if not impossible) on the svn switch 
to the branch/tag. Perforce style tagging does work, svn does not since 
it's a branch unfortunately. We did consider this option.


Thanks Daniel!

one last q though: is the vtable-reparent the equivalent of a 
C++/Object Oriented Virtual Method? Where any given session (ssh, 
svnserve, file, http) can override as necessary?



   --Eric



Re: Performance of svn+ssh vs. file for multiple files

2010-07-08 Thread Stefan Sperling
On Thu, Jul 08, 2010 at 11:13:12AM -0600, Eric Peers wrote:
 I ended up writing a routine that uses the reparent call as
 previously discussed with a minor rework of the
 svn_client__update_internal to accomodate this. Overall time to
 update: 3.09s rather than 53s originally by reusing the session.
 Once I polish up the code, I'll post a copy on my blog if anybody
 wants it.

I'm stumbling into this conversion, but why put it on a blog?
What about submitting a patch instead?
http://subversion.apache.org/docs/community-guide/general.html#patches

Stefan


Declare branches to be equal?

2010-07-08 Thread Kris Deugau
I've got a repository that saw moderate use for several years, then the 
project reached a stable point.


I upgraded SVN as I went along, however on my primary dev system I've 
been stuck with a 1.4 client (CentOS 4).


Recently, I've switched to a different system for further development on 
this project, made a number of commits to bring /trunk and 
/branches/stable into sync, and done further development on /trunk.


I'd like to merge my changes from /trunk now, but I'd also like to make 
use of the merge tracking features that have been added since SVN 1.4.


Is there a way to do svn merge --record-only that will result in 
/trunk and /branches/stable being considered equivalent and/or fully 
merged as of a given revision?


Historically, some changes have been made first on /trunk, then merged 
to /branches/stable (mostly new development);  others have been made the 
other way around (bugfixes).  :/


I'd like to avoid walking back over the log to explicitly run svn merge 
--record-only rA:B source dest for each of these historical merges.


-kgd


Re: How to access local svnserve repository in Windows

2010-07-08 Thread Itamar O
On Thu, Jul 8, 2010 at 8:07 PM, David Bartmess dingod...@edingo.net wrote:

 I've setup a local repository under C:\svn_repository\Test using svnadmin
 create c:\svn_repository\Test, and want to access it via the command line
 svn.exe. The svnserve is setup as a Windows service, and I can see that it's
 started.

 The binpath in the service entry is
 C:\Program Files\CollabNet\Subversion Server\svnserve.exe --server -r
 C:\svn_repository -listen-port 3690


the syntax seems incorrect.
I think the --server switch should be --service,
the argument for the -r switch needs to be a repository (e.g.
C:\svn_repository\Test),
and the --listen-port switch is missing a -.



 The question is, what is the correct syntax for accessing the svnserve
 service to import a new project?

 I've tried the following with no success:
 svn import -m Test import . svn://dingo.home/Test
 svn: Unknown hostname 'dingo.home'
 svn import -m Test import . svn://localhost/Test
 svn: No repository found in 'svn://localhost/Test'


if you run svnserve as I explained above, you should be able to access the
repository via http://localhost/ (drop the Test).
maybe if you use the --listen-host dingo.home switch you will also be able
to access svn://dingo.home/



 --
 Dingo Dave Bartmess
 Broomfield, CO. USA
 http://edingo.net





Re: How to access local svnserve repository in Windows

2010-07-08 Thread Ryan Schmidt
On Jul 8, 2010, at 14:25, Itamar O wrote:
 On Thu, Jul 8, 2010 at 8:07 PM, David Bartmess wrote:
 I've setup a local repository under C:\svn_repository\Test using svnadmin 
 create c:\svn_repository\Test, and want to access it via the command line 
 svn.exe. The svnserve is setup as a Windows service, and I can see that it's 
 started.
 
 The binpath in the service entry is
 C:\Program Files\CollabNet\Subversion Server\svnserve.exe --server -r 
 C:\svn_repository -listen-port 3690
 
 
 the syntax seems incorrect.
 I think the --server switch should be --service,

I'll defer to your expertise; I don't have Windows to verify this with.

 the argument for the -r switch needs to be a repository (e.g. 
 C:\svn_repository\Test),

AFAIK -r doesn't need to point to a repository; it just needs to be a parent 
directory to which you want to limit svnserve's access.

 and the --listen-port switch is missing a -.

Yes, but the default listen port is 3690 so this should not have been a 
problem, should it?


 The question is, what is the correct syntax for accessing the svnserve 
 service to import a new project?
 
 I've tried the following with no success:
 svn import -m Test import . svn://dingo.home/Test
 svn: Unknown hostname 'dingo.home'
 svn import -m Test import . svn://localhost/Test
 svn: No repository found in 'svn://localhost/Test'
 
 
 if you run svnserve as I explained above, you should be able to access the 
 repository via http://localhost/ (drop the Test).
 maybe if you use the --listen-host dingo.home switch you will also be able 
 to access svn://dingo.home/

I would say Subversion doesn't think dingo.home is a valid hostname. Is it? Can 
you ping it? Can you access any other services via this hostname? If not, then 
you have something unrelated to Subversion that you need to fix first.



Re: How to access local svnserve repository in Windows

2010-07-08 Thread David Bartmess

On 7/8/2010 1:25 PM, Itamar O wrote:
On Thu, Jul 8, 2010 at 8:07 PM, David Bartmess dingod...@edingo.net 
mailto:dingod...@edingo.net wrote:


I've setup a local repository under C:\svn_repository\Test using
svnadmin create c:\svn_repository\Test, and want to access it
via the command line svn.exe. The svnserve is setup as a Windows
service, and I can see that it's started.

The binpath in the service entry is
C:\Program Files\CollabNet\Subversion Server\svnserve.exe
--server -r C:\svn_repository -listen-port 3690


the syntax seems incorrect.
I think the --server switch should be --service,
That was a typo caused by me having to type it in from another machine 
for the email.
the argument for the -r switch needs to be a repository (e.g. 
C:\svn_repository\Test),

and the --listen-port switch is missing a -.
Another typo on the --listen-port, but the -r is supposed to be a parent 
directory that I want to limit the svn access to, not necessarily a 
repository itself, according to the docs...



The question is, what is the correct syntax for accessing the
svnserve service to import a new project?

I've tried the following with no success:
svn import -m Test import . svn://dingo.home/Test
svn: Unknown hostname 'dingo.home'
svn import -m Test import . svn://localhost/Test
svn: No repository found in 'svn://localhost/Test'


if you run svnserve as I explained above, you should be able to access 
the repository via http://localhost/ (drop the Test).
I'm not using a web server, just svnserve. http://localhost/ wouldn't 
get me anywhere


maybe if you use the --listen-host dingo.home switch you will also 
be able to access svn://dingo.home/


--
Dingo Dave Bartmess
Broomfield, CO. USA
http://edingo.net



RE: How to choose between svn http?

2010-07-08 Thread Keith Moore
 -Original Message-
 From: laps...@gmail.com [mailto:laps...@gmail.com] On Behalf Of STF SVN
 Sent: Thursday, 8 July 2010 22:15
 To: users@subversion.apache.org
 Subject: How to choose between svn  http?
 
  As we have two protocoles, svn and http, available for
 subversion, I'd like to know if there's any performance comparison
 study on both of them to let us choose the most appropriate one.
 Anyone has any related article on that?
 
 TIA
 

Perhaps try a google search? 
http://www.google.com.au/search?q=svn+vs+httpie=utf-8oe=utf-8aq=t



#
Attention:
The information contained in this message and or attachments is intended
only for the person or entity to which it is addressed and may contain
confidential and/or privileged material. Any review, retransmission,
dissemination or other use of, or taking of any action in reliance upon,
this information by persons or entities other than the intended recipient
is prohibited. If you received this in error, please contact the sender and
delete the material from any system and destroy any copies.
#


Re: Performance of svn+ssh vs. file for multiple files

2010-07-08 Thread Daniel Shahaf
Eric Peers wrote on Thu, 8 Jul 2010 at 20:13 -:
 @Les: tags/branches don't work in this case because an edit on this can change
 the tag/branch and because the merge of local edits + local version changes
 becomes cumbersome (if not impossible) on the svn switch to the branch/tag.
 Perforce style tagging does work, svn does not since it's a branch
 unfortunately. We did consider this option.
 

Perhaps a 'tag' composed of file externals?

 one last q though: is the vtable-reparent the equivalent of a C++/Object
 Oriented Virtual Method? Where any given session (ssh, svnserve, file, http)
 can override as necessary?

Close, but not exactly.  A vtable could be compared to an abstract class; 
each of the four RA libraries (ra_local for file://, ra_svn for svn*://, 
ra_neon and ra_serf for http://) implements that vtable.  (We also use 
vtables in other places, e.g., between libsvn_fs and libsvn_fs_*.)

In practice, every library defines all vtable members, so it's 
s/can override/must define/.


Re: clients not supporting http?

2010-07-08 Thread Daniel Shahaf
Jason Aubrey wrote on Thu, 8 Jul 2010 at 14:05 -:
 (2) When i attempted to download a single-file,
 svn complained that the file name was not a directory
 name and rejected the request.
 

You can use 'svn cat' or 'svn export' or 'svn co --depth empty' to get a 
single file.

Next time please explain your problem in more details (ideally including 
shell session transcripts).


Re: clients not supporting http?

2010-07-08 Thread Nico Kadel-Garcia
On Thu, Jul 8, 2010 at 10:13 AM, Campbell Allan
campbell.al...@sword-ciboodle.com wrote:

 On Thursday 08 Jul 2010, Nico Kadel-Garcia wrote:
 On Thu, Jul 8, 2010 at 7:05 AM, Jason Aubrey aubre...@gmail.com wrote:
  Hi All,
 
  I recently set up svn over http for a project I'm involved with. One
  user made the following complaints:
 
  (1) Some svn clients do not support the http protocol.  This
  is a common occurrence when a user builds svn from source.
 
  Because the svn transport svn:// is the standard,
  internal transport for svn, every svn client should
  support it.

 Yup: if you don't have the HTTPD or Apache include files installed,
 known as the httpd-devel package under RPM based Linux distributions
 like RedHat and Fedora, you can't build the relevant software because
 you lack the compilation tools. The ./configure script detects this
 and disables the relevant features.


 Are you certain about that? Neon or serf provide the client with http support
 and are both in the subversion-deps source tarball. I'm fairly sure all the
 machines I've compiled on have never had the httpd-devel like packages
 installed (or in some cases any dev packages beyond the compiler). https
 support can be tricky as this will require either the openssl dev package to
 be installed or a local build handy.

You seem to be correct. It's the neon *include* files, not merely the
libraries, that are needed to compile some of this behavior in
standard Fedora and RHEL setups. I've not tried it with serf.

As pointed out elsewhere, it's mod_dav_svn that needs httpd related
utilities. Mind you, picking and choosing bits to leave out of a
Subversion setup is like picking the wrench you won't need in your
toolbox. If you're squeezed for space, leave one out, but it's
inevitably the one you didn't bring that you turn out to need


Re: How to choose between svn http?

2010-07-08 Thread Nico Kadel-Garcia
On Thu, Jul 8, 2010 at 7:11 PM, Keith Moore keith.mo...@securency.com wrote:
 -Original Message-
 From: laps...@gmail.com [mailto:laps...@gmail.com] On Behalf Of STF SVN
 Sent: Thursday, 8 July 2010 22:15
 To: users@subversion.apache.org
 Subject: How to choose between svn  http?

      As we have two protocoles, svn and http, available for
 subversion, I'd like to know if there's any performance comparison
 study on both of them to let us choose the most appropriate one.
 Anyone has any related article on that?

     TIA


 Perhaps try a google search? 
 http://www.google.com.au/search?q=svn+vs+httpie=utf-8oe=utf-8aq=t

Most of the links are useless, discussing other subject, addressing
far too old of releases, or not doing a straight comparison.

A local comparison is often best, especially when operating over HTTPS
or svn+ssh for security reasons: Because of the continuing storage of
HTTP/HTTPS/svn/SSH passwords in clear-text by the UNIX or Linux
versions of Subversion, I don't trust anything but the svn+ssh public
key based access for public use. Unfortunately, this does cause a
noticeable performance hit.

Performance can also be dominated by the size of the repository, and
the use of chatty file storage technologies such as CIFS, which can
seriously slow the checkout of bulky working copies with lots of
files. (I've run into this recently: what took 2.5 minutes to NFS
shares took 25 minutes to CIFS shares. It was embarassing!)


Re: How to choose between svn http?

2010-07-08 Thread David Brodbeck

On Jul 8, 2010, at 4:49 PM, Nico Kadel-Garcia wrote:
 A local comparison is often best, especially when operating over HTTPS
 or svn+ssh for security reasons: Because of the continuing storage of
 HTTP/HTTPS/svn/SSH passwords in clear-text by the UNIX or Linux
 versions of Subversion, I don't trust anything but the svn+ssh public
 key based access for public use. Unfortunately, this does cause a
 noticeable performance hit.

It's worth pointing out that the private key has to have a passphrase, for this 
to be a security improvement. Otherwise all you've accomplished is to leave the 
password-equivalent in ~/.ssh instead of in ~/.svn. ;)  I mention this only 
because a lot of the applications for SSH public keys involve passwordless 
login.

 
 Performance can also be dominated by the size of the repository, and
 the use of chatty file storage technologies such as CIFS, which can
 seriously slow the checkout of bulky working copies with lots of
 files. (I've run into this recently: what took 2.5 minutes to NFS
 shares took 25 minutes to CIFS shares. It was embarassing!)

Virus scanning overhead can really bite you here, too.

-- 

David Brodbeck
System Administrator, Linguistics
University of Washington






Re: How to choose between svn http?

2010-07-08 Thread Alec Kloss
On 2010-07-08 17:04, David Brodbeck wrote:
 
 On Jul 8, 2010, at 4:49 PM, Nico Kadel-Garcia wrote:
  A local comparison is often best, especially when operating over HTTPS
  or svn+ssh for security reasons: Because of the continuing storage of
  HTTP/HTTPS/svn/SSH passwords in clear-text by the UNIX or Linux
  versions of Subversion, I don't trust anything but the svn+ssh public
  key based access for public use. Unfortunately, this does cause a
  noticeable performance hit.
 
 It's worth pointing out that the private key has to have a passphrase, for 
 this to be a security improvement. Otherwise all you've accomplished is to 
 leave the password-equivalent in ~/.ssh instead of in ~/.svn. ;)  I mention 
 this only because a lot of the applications for SSH public keys involve 
 passwordless login.
 
[chop]

I feel a little like a broken record, but...

using GSSAPI (or Negotiate for HTTPS) substantially reduces the security
issues by integrating authentication into the rest of a managed
single-sign-on system.  GSSAPI/Negotiate also has the feature of working
in all four remote access protocols for Subversion.  The downside is
difficulty in configuration and poor support in some (or many or perhaps
all) binary distributions of Subversion.  I have to admit, I don't think
very highly of ssh public-key authentication;  I have a hard time
believing very many users or administrators carefully protect, rotate,
and revoke RSA keys in a timely manner, which seems to me to
substantially reduce the security of ssh public-key infrastructure.

--
alec.kl...@oracle.com   Oracle Middleware
The views expressed are my own and do not necessarily 
reflect the views of Oracle
PGP key: http://pgp.mit.edu:11371/pks/lookup?op=getsearch=0xEBD1FF14


pgpNbYROMon9k.pgp
Description: PGP signature


Re: clients not supporting http?

2010-07-08 Thread David Weintraub
On Thu, Jul 8, 2010 at 6:05 AM, Jason Aubrey aubre...@gmail.com wrote:
 Hi All,

 I recently set up svn over http for a project I'm involved with. One
 user made the following complaints:

 (1) Some svn clients do not support the http protocol.  This
 is a common occurrence when a user builds svn from source.

Yes and no. Almost every binary available supports the HTTP protocol.
I would even go so far as to say they all do, but somewhere is an
obscure client (maybe for some Thuderbird Basic OS system) that
doesn't.

A much more likely occurrence is that someone builds their own binary
and doesn't have the neon and APR libraries needed for building with
the HTTP protocol. That binary would not support HTTP. However, you
can get pre-build binaries for almost every single OS you can name.
There should be no reason why a developer needs to build their own.

Your developer can go to http://www.sunfreeware.com to get a
Subversion client that uses the HTTP protocol for his Solaris machine.

 (2) When i attempted to download a single-file,
 svn complained that the file name was not a directory
 name and rejected the request.

Subversion only allows you to check out directories. You can use the
svn cat command to get single files, but if you're doing a checkout,
you need to checkout a directory.

NOTE: You can use the --depth=empty switch to checkout a directory
with no files in it, then do an svn update fileName to get the
single file you want. I discourage developers from doing this because
what they're doing is making a change without any testing. That is a
no-no.

-- 
David Weintraub
qazw...@gmail.com


Re: How to access local svnserve repository in Windows

2010-07-08 Thread Lorenz
David Bartmess wrote:
I've setup a local repository under C:\svn_repository\Test using 
svnadmin create c:\svn_repository\Test, and want to access it via the 
command line svn.exe. The svnserve is setup as a Windows service, and I 
can see that it's started.
[...]
svn import -m Test import . svn://localhost/Test
svn: No repository found in 'svn://localhost/Test'

so it seems your server is running ok (because that is a response from
the server), but either there is something wrong with the path you
gave when starting the server, or something went wrong whit creating
the repository.

does accessing the repository via file:// protocol work?
Try something like
 svn list file:///c:/svn_repository/Test