Re: vendor branch merge: how to highlight patches for review?

2012-08-28 Thread Ryan Schmidt
On Aug 28, 2012, at 17:56, Q. Chap wrote: > >>> >>> What command(s) should I use to bring in the "libcomplex/2.0" changes but >>> identify the all files I ever messed with? >> >> These are two separate operations. >> >> [snip] >> >> $ svn merge ^/vendor/libcomplex/1.0 \ >> ^/vendor/libco

svnsync in post commit script

2012-08-28 Thread dhanushka ranasinghe
Hi.. im trying to setup svn replication using svnsync, when i ran flowing the svnsync command [1] in master server's terminal its syncing fine , but when i put same svnsync command in post-commit script it gives the following error [2] [1] /usr/bin/svnsync --source-username=svnsync --sync-use

Re: vendor branch merge: how to highlight patches for review?

2012-08-28 Thread Q. Chap
> > > > What command(s) should I use to bring in the "libcomplex/2.0" changes but > > identify the all files I ever messed with? > > These are two separate operations. > >  [snip] > > $ svn merge ^/vendor/libcomplex/1.0 \ >  ^/vendor/libcomplex/2.0 \ >  libcomplex > > [snip] > > And then subsequ

Svn 1.7 merge info property

2012-08-28 Thread Rp0013
Hi I wanted to mute the svn merge info property on my subversion server Is there such a way We don't need the info currently and when merging it is causing a huge log with all changes to property being recorded and what we need is only the code merge Regards, Rajesh Sent from my iPhone

Re: vendor branch merge: how to highlight patches for review?

2012-08-28 Thread Ryan Schmidt
On Aug 28, 2012, at 15:57, "Q. Chap" wrote: > When I merge the updates from "/vendor/libcomplex/2.0" to my project > trunk/branch I will have many updated files in that working copy prior to > commit. > > Most of these updates I'd like to accept as-is, because they reflect the > vendor's chan

vendor branch merge: how to highlight patches for review?

2012-08-28 Thread Q. Chap
Hello, I've been reading: http://svnbook.red-bean.com/en/1.7/svn-book.html#svn.advanced.vendorbr http://svnbook.red-bean.com/en/1.7/svn-book.html#svn.advanced.vendorbr&lang= This looks great, but I have a question. (Assuming, per the examples, that I have local patches to "libcomplex-1.0")

RE: svn merge help

2012-08-28 Thread Douglass Davis
The changes are included in the services branch, but not in the online branch. I want to take changes from one branch (services) and apply them to the other (online). - Doug From: John Maher [mailto:jo...@rotair.com] Sent: Tuesday, August 28, 2012 4:08 PM To: Douglass Davis; users@subversion.ap

RE: svn merge help

2012-08-28 Thread John Maher
I can be wrong because I'm struggling with this myself, but shouldn't rev 9995 already include all the prior changes? JPM From: Douglass Davis [mailto:dda...@northcarolina.edu] Sent: Tuesday, August 28, 2012 3:55 PM To: users@subversion.apache.org Subject:

svn merge help

2012-08-28 Thread Douglass Davis
Hi, Client is svn, version 1.6.11 (r934486) I read the manual, but I'm not sure what I'm doing wrong. I copied https://mydomain/services/trunk (services) to https://mydomain/online/trunk (online) at revision 9884. There were several bugfixes made on services that I wanted to put in online.

Re: svn 1.7 client issues error on update of single file externals

2012-08-28 Thread Daniel Shahaf
Johan Corveleyn wrote on Tue, Aug 28, 2012 at 11:56:44 +0200: > On Tue, Aug 28, 2012 at 8:17 AM, Boe, Aasmund wrote: > > Bump. Has anyone observed the below issue, where subversion 1.7.x client > > issues an error when using 'svn update' on folders containing single file > > svn:externals? Note

Re: JavaHL info2 problem

2012-08-28 Thread Mark Phippard
On Tue, Aug 28, 2012 at 1:14 PM, Marcin Porwit wrote: > I'm calling the non-deprecated version of info2: > http://subversion.apache.org/docs/javahl/1.7/org/tigris/subversion/javahl/SVNClientInterface.html#info2(java.lang.String, > org.tigris.subversion.javahl.Revision, > org.tigris.subversion.j

Re: JavaHL info2 problem

2012-08-28 Thread Marcin Porwit
Hi Mark, I'm calling the non-deprecated version of info2: http://subversion.apache.org/docs/javahl/1.7/org/tigris/subversion/javahl/SVNClientInterface.html#info2(java.lang.String, org.tigris.subversion.javahl.Revision, org.tigris.subversion.javahl.Revision, int, java.lang.String[], org.tigris.su

Utilisateurs francophones de systèmes de gestion de code source

2012-08-28 Thread Mihamina Rakotomandimby
Hello, I was looking for a french speaking place to discuss about Git, Hg, SVN and all other SCM in use and did not find. This is then an attempt to create one. I created a Google group: https://groups.google.com/forum/?fromgroups#!forum/sgcs-fr I invite french sepaking people to join. The g

RE: 'invalid status for updateting properties' error during reintegrate merge (was: no subject)

2012-08-28 Thread James French
From: Stefan Sperling [s...@elego.de] Sent: 28 August 2012 15:03 To: James French Cc: users@subversion.apache.org Subject: Re: 'invalid status for updateting properties' error during reintegrate merge (was: no subject) On Tue, Aug 28, 2012 at 01:15:08PM

Re: assertion failed (status != svn_wc__db_status_normal)

2012-08-28 Thread Stefan Sperling
On Tue, Aug 28, 2012 at 10:02:06AM -0400, Peter Amstutz wrote: > I get the following error when trying to update a checkout. I did a > cleanup of the checkout, but that did not affect the error. The > problem occurs only with one specific checkout, and on > re-downloading out the same repository

assertion failed (status != svn_wc__db_status_normal)

2012-08-28 Thread Peter Amstutz
I get the following error when trying to update a checkout. I did a cleanup of the checkout, but that did not affect the error. The problem occurs only with one specific checkout, and on re-downloading out the same repository I do not get the error on the new checkout. I am using TortoiseSVN

Re: 'invalid status for updateting properties' error during reintegrate merge (was: no subject)

2012-08-28 Thread Stefan Sperling
On Tue, Aug 28, 2012 at 01:15:08PM +0100, James French wrote: > Hi, > > Using svn 1.7.6 I've had an error a couple of times on reintegration. Here is > the scenario: > > - A file called checkBackwardsCompatibilty.bat is on trunk and has merge info > on it (I don't want it to but that's a separa

Re: JavaHL info2 problem

2012-08-28 Thread Mark Phippard
On Mon, Aug 27, 2012 at 6:40 PM, Marcin Porwit wrote: > I'm running into a problem with the info2 call in the 1.6 JavaHL library. I > am attempting to use this to fake password > validation for a user, so if this is a bass-ackwards way of doing things, > please let me know. I issue two calls t

[no subject]

2012-08-28 Thread James French
Hi, Using svn 1.7.6 I've had an error a couple of times on reintegration. Here is the scenario: - A file called checkBackwardsCompatibilty.bat is on trunk and has merge info on it (I don't want it to but that's a separate discussion). - The merge info on this file gets updated regularly as peop

RE: svn 1.7 client issues error on update of single file externals

2012-08-28 Thread Boe, Aasmund
> W160016 is the server-side error SVN_ERR_FS_NOT_DIRECTORY so it looks as > if the server might be the problem. I don't have a 1.1.4 server to try. > If you provide a complete reproduction recipe it would allow you to try > a newer server and allow other people to try as well. > > -- > Philip I

Re: svn 1.7 client issues error on update of single file externals

2012-08-28 Thread Johan Corveleyn
On Tue, Aug 28, 2012 at 8:17 AM, Boe, Aasmund wrote: > Bump. Has anyone observed the below issue, where subversion 1.7.x client > issues an error when using 'svn update' on folders containing single file > svn:externals? Note that subversion does indeed update the externals, it > marely issues

Re: svn 1.7 client issues error on update of single file externals

2012-08-28 Thread Philip Martin
"Boe, Aasmund" writes: > For reference, the server side uses a very old version (1.1.4 > [r13838]), but from what I know externals is a client "feature" so an > old server should not be a problem. Besides, this workes well using > subversion 1.6.x (client). > > This is the scenario I observe: > >

Re: Bug: svn: E000002: Can't create temporary file from template '/tmp/svn-XXXXXX': No such file or directory

2012-08-28 Thread Stefan Sperling
Hi Edwin, Seems like HP-UX's mktemp() shouldn't be used by APR. Cross-posting this to apr-dev. I believe it should be addressed in APR rather than Subversion. On Tue, Aug 28, 2012 at 11:33:48AM +0300, Edwin Goh wrote: > OS: HP-UX > > SVN: svn, version 1.7.6 (r1370777) compiled Aug 20 2012, 15:40

Re: Pristiine copy not present

2012-08-28 Thread Ulrich Eckhardt
Note up front: Please don't top-post, it makes it difficult to understand what exactly you are referring to. Am 28.08.2012 10:14, schrieb Simon Heffer: svn --version gives: svn, version 1.7.2 (r1207936) compiled Nov 29 2011, 22:11:27 There's no build system issue here. So you don't use svn

Bug: svn: E000002: Can't create temporary file from template '/tmp/svn-XXXXXX': No such file or directory

2012-08-28 Thread Edwin Goh
OS: HP-UX SVN: svn, version 1.7.6 (r1370777) compiled Aug 20 2012, 15:40:19 SVN are download from http://hpux.connect.org.uk/ HP-UX mktemp man page http://docstore.mik.ua/manuals/hp-ux/en/B2355-60130/mktemp.3C.html When I tried to perform a commit with HP-UX svn client, I received the followi

RE: Pristiine copy not present

2012-08-28 Thread Simon Heffer
Thanks all, svn --version gives: svn, version 1.7.2 (r1207936) compiled Nov 29 2011, 22:11:27 There's no build system issue here. We build a number of different machines (windows and UNIXs) and copy the results onto the final machine (Windows Server 2003 SP2). A script is then run to copy th