correctly merging partially branched directories

2010-09-20 Thread Tino Schwarze
Hi there, I'm currently preparing our move from CVS to SVN. We've got a rather large application consisting of several modules some of which are specific for some customers. Our repository will look like this: /trunk/core-module /trunk/xyz-module /trunk/customerABC-module-1 (several modules per

"make clean" failes

2010-09-20 Thread mara raram
Hi, I just stumbled upon the following error triggered by 'make clean' --- snip --- cd [...]/subversion-1.6.12/subversion/bindings/ctypes-python; \ none setup.py clean --all bash: line 1: none: command not found *** Error code 127 make: Fatal error: Command failed for target `clean-ctypes-pytho

build of subversion 1.6.12 on solaris failed

2010-09-20 Thread mara raram
Hi, trying to compile subversion-16.12 on sparc solaris 5.10 fails with --- snip --- /bin/bash /tmp/subversion-1.6.12/libtool --tag=CC --silent --mode=compile gcc -DSOLARIS2=10 -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT -D_LARGEFILE64_SOURCE -g -O2 -g -O2 -D_LARGEFILE64_SOURCE -DNE_LFS -I./subver

Re: correctly merging partially branched directories

2010-09-20 Thread Tino Schwarze
Hi there, I suppose, I found the solution: To perform a merge, I'll only check out the affected modules (e.g. /branches/customerABC/solution1/1.0), then do an "svn merge" on each of the modules separately. After resolving any conflicts, I'll just commit everything at once. The same works for back

Java API?

2010-09-20 Thread Thomas P Laford
Is there a Java library available that would allow me to access a file stored in Subversion (TortoiseSVN 1.6) from a Java application and extract its modification date/time?

Re: Java API?

2010-09-20 Thread vishwajeet singh
On Tue, Sep 21, 2010 at 1:12 AM, Thomas P Laford < thomas_p_laf...@raytheon.com> wrote: > Is there a Java library available that would allow me to access a file > stored in Subversion (TortoiseSVN 1.6) from a Java application and extract > its modification date/time? Have a look at http://svnki

Re: 'vnadmin: Dump stream contains a malformed header (with no ':') at '

2010-09-20 Thread Daniel Shahaf
Prashant N wrote on Thu, Sep 16, 2010 at 18:21:22 +0530: > Hi, > > I have created my repository dumps using : > svnadmin --quiet --deltas /path/to/repo > remo.dump > > The svn --version produces 1.4.2 and the dump was created on a RHEL4 > system. When I try to load / restore the dump in another s

I need help understanding license

2010-09-20 Thread Johno 48
Hello, I am considering using CollabNet Subversion Edge 1.2.1 (for Windows 32 bit) for version control during the development of a computer game. I plan to sell this computer game once its completed and hence do not want to share with the world for free all of the source code, images, et

svn merge --reintegration.

2010-09-20 Thread Gavin Beau Baumanis
Hi Everyone, I am having some issues with merging that I could use some advice on, please. I have a trunk and a customer branch. The decision has been made that all features belonging to the branch need to be added back into the trunk. Changes have also been ongoing in the trunk too. Is there

Re: Java API?

2010-09-20 Thread Lorenz
vishwajeet singh wrote: >On Tue, Sep 21, 2010 at 1:12 AM, Thomas P Laford < >thomas_p_laf...@raytheon.com> wrote: >> Is there a Java library available that would allow me to access a file >> stored in Subversion (TortoiseSVN 1.6) from a Java application and extract >> its modification date/time? >

Re: I need help understanding license

2010-09-20 Thread Ryan Schmidt
On Sep 20, 2010, at 19:41, Johno 48 wrote: >I am considering using CollabNet Subversion Edge 1.2.1 (for Windows 32 > bit) for version control during the development of a computer game. I plan to > sell this computer game once its completed and hence do not want to share > with the worl