Incomplete SVN dump files

2015-09-14 Thread Eric Johnson
I'm in a situation where I'm dumping Subversion repositories from remote locations (using svnrdump). The repositories are big enough, and the network connections between destinations just unstable enough that the repositories aren't making it all in one dump call. I've noticed, for one repository

Re: start-commit hook client capabilities - mergeinfo only?

2015-09-14 Thread Branko Čibej
On 15.09.2015 00:38, Brett Randall wrote: > I have these versions: > > Client: svn, version 1.8.8 (r1568071) with ra_svn, ra_local and ra_serf > Server: version 1.8.9 (r1591380) with fs_fs > Using protocol https:// > > I created and installed a start-commit hook that echos its third > parameter (cl

RE: svnsync: Authorization failed

2015-09-14 Thread Li, Hubert
Yes, I tried --sync-username and --sync-password: subversion/svnserve/serve.c:167: (apr_err=170001) svnsync: Authorization failed Thanks, Hubert Li ARRIS o: +86 571-2811-7111 c: +86 130-1890-4390 From: Eric Johnson [mailto:e...@tibco.com] Sent: Tuesday, September 15, 2015 12:16 AM To: Li, Hubert

start-commit hook client capabilities - mergeinfo only?

2015-09-14 Thread Brett Randall
I have these versions: Client: svn, version 1.8.8 (r1568071) with ra_svn, ra_local and ra_serf Server: version 1.8.9 (r1591380) with fs_fs Using protocol https:// I created and installed a start-commit hook that echos its third parameter (client capabilities) to a log file, ran a test-commit with

Re: 1.9 - Can't resolve to 'mine full' option for binary file conflict

2015-09-14 Thread Pete Harlan
On Mon, Sep 14, 2015 at 3:03 AM, Bert Huijben wrote: >> On 9/14/2015 7:56 AM, Daniel Becroft wrote: >> > Hi guys, >> > >> > >> > I've just upgraded to SVN 1.9. One of the first things I noticed is >> > that when a binary file conflict is raised during an SVN update, I can >> > no longer use the 'm

Re: svnsync: Authorization failed

2015-09-14 Thread Eric Johnson
Hi Hubert, There should be two sets of credentials you can pass to svnsync. I don't remember what they're called for 1.6. Did you try passing the --sync-username and --sync-password? Eric. On Sun, Sep 13, 2015 at 11:59 PM, Li, Hubert wrote: > Thanks, Eric. I tried to add –username and –passwor

Re: 1.9 - Can't resolve to 'mine full' option for binary file conflict

2015-09-14 Thread Stefan Sperling
On Mon, Sep 14, 2015 at 12:27:44PM +0100, Philip Martin wrote: > Index: ../src/subversion/svn/conflict-callbacks.c > === > --- ../src/subversion/svn/conflict-callbacks.c(revision 1702397) > +++ ../src/subversion/svn/conflict-ca

Re: 1.9 - Can't resolve to 'mine full' option for binary file conflict

2015-09-14 Thread Philip Martin
Philip Martin writes: > or perhaps this: > > Index: ../src/subversion/svn/conflict-callbacks.c > === > --- ../src/subversion/svn/conflict-callbacks.c(revision 1702397) > +++ ../src/subversion/svn/conflict-callbacks.c(

Re: 1.9 - Can't resolve to 'mine full' option for binary file conflict

2015-09-14 Thread Philip Martin
Indeed there is a bug: svnadmin create repo svnmucc -mm -U file://`pwd`/repo put repo/format f propset svn:mime-type application/octet f svnmucc -mm -U file://`pwd`/repo put repo/db/format f svn co file://`pwd`/repo@1 wc echo xx > wc/f svn up wc The initial conflict prompt offers: Conflict di

Re: 1.9 - Can't resolve to 'mine full' option for binary file conflict

2015-09-14 Thread Daniel Becroft
Thanks, Bert. I understand the removal of "mine-full", and combining it with the "working" option. But, the issue is that there is no functional option that allows the user to select to keep the "working" (mine) version of the conflict. If I select (r) (accept the working version of the file), I ge

RE: 1.9 - Can't resolve to 'mine full' option for binary file conflict

2015-09-14 Thread Bert Huijben
> -Original Message- > From: Stefan Hett [mailto:ste...@egosoft.com] > Sent: maandag 14 september 2015 09:54 > To: users@subversion.apache.org > Subject: Re: 1.9 - Can't resolve to 'mine full' option for binary file > conflict > > On 9/14/2015 7:56 AM, Daniel Becroft wrote: > > Hi guys,

AW: AW: AW: AW: NTLM authentication in subversion 1.9.0?

2015-09-14 Thread Grabner Markus
I'm pretty sure that ApacheHaus used the sources from here: https://github.com/YvesR/mod_authn_ntlm At least the options in my config file are consistent with the source code. The code is based on (and almost identical to) this project: http://sourceforge.net/projects/mod-auth-sspi The mod-auth-

Re: svnsync: Authorization failed

2015-09-14 Thread Stefan Hett
Normally running a clean-up would solve these lock issues (svn cleanup). Sorry, no idea with ur actual authorization issue. If things worked before, I'd assume it's something with outdated/invalid credentials or problems due to some server-side upgrades of the authorization methods/set-up. I

Re: 1.9 - Can't resolve to 'mine full' option for binary file conflict

2015-09-14 Thread Stefan Hett
On 9/14/2015 7:56 AM, Daniel Becroft wrote: Hi guys, I've just upgraded to SVN 1.9. One of the first things I noticed is that when a binary file conflict is raised during an SVN update, I can no longer use the 'mine-full' option to resolve. The only options I have are: (r) working and (tf)

RE: svnsync: Authorization failed

2015-09-14 Thread Li, Hubert
I got the new error messages below: [root@zch124svn01 tmp]# svnsync info svn://zch124svn01.ap.mot-mobility.com/miracle3 subversion/libsvn_subr/sqlite.c:192: (apr_err=200030) svnsync: database is locked subversion/libsvn_subr/sqlite.c:362: (apr_err=200030) svnsync: database is locked Thanks, Hube

RE: svnsync: Authorization failed

2015-09-14 Thread Li, Hubert
Thanks, Eric. I tried to add –username and –password in svnsync, and got the same error messages. Yes, 1.6.6 is old, but we have to use it for some reasons. Thanks, Hubert Li ARRIS From: Eric Johnson [mailto:e...@tibco.com] Sent: Monday, September 14, 2015 2:43 PM To: Li, Hubert Cc: users@subve