Re: Mergeinfo overwritten from successive merges

2014-03-13 Thread Branko Čibej
On 14.03.2014 02:18, Jeb Wilson wrote: > > Hello, > > > > I’ve reproduced this mergeinfo overwriting issue using the following > steps. We are seeing this with svn client v1.8.8, and using a remote > VisualSVN server v2.7.0 (which uses svn v1.8.8). NOTE: This cannot be > replicated by using a loc

Re: Not enough infer to resolve 'loaded an incompatible library'

2014-03-13 Thread Torsten Budesheim
Mark, excellent! It’s exactly how you said, though Homebrew doesn’t provide Serf as a separate package anymore and instead includes it in SVN as a private package, it was still on my machine from the original installation a long time ago. Running ‘brew remove serf’ did fix it. Thank you! Torste

Re: Mergeinfo overwritten from successive merges

2014-03-13 Thread Jeb Wilson
Hello, I've reproduced this mergeinfo overwriting issue using the following steps. We are seeing this with svn client v1.8.8, and using a remote VisualSVN server v2.7.0 (which uses svn v1.8.8). NOTE: This cannot be replicated by using a locally created repo...we've only been able to replicate w

Re: SVN 1.8 merge (branch reuse) seems broken when having local mergeinfo

2014-03-13 Thread Tim van Halteren
Thanks for your response. Being at home right now I tried your script on OS/X which has SVN 1.7.10 on it and I noticed something interesting. Prior to 1.8 we needed to do a merge with the --record-only option when we wanted to re-use the branch (keep alive dance). So I first modified the last scri

Re: SVN 1.8 merge (branch reuse) seems broken when having local mergeinfo

2014-03-13 Thread Philip Martin
Tim van Halteren writes: > No replies? Is this a bug or user error? Do I need to file a bug? > Could I have done something differently to increase the chance of a response? I can reproduce it with trunk. This is my Unix version of your script: #!/bin/sh rm -rf repo wc svnadmin create repo --

Re: SVN 1.8 merge (branch reuse) seems broken when having local mergeinfo

2014-03-13 Thread Tim van Halteren
No replies? Is this a bug or user error? Do I need to file a bug? Could I have done something differently to increase the chance of a response? Thx, Tim On 3/6/2014 6:15 PM, Tim van Halteren wrote: We have a problem with the new 1.8 subversion clients (we use TortoiseSVN 1.8.5 and SlikSVN

Re: svn sync error svn_path_is_empty

2014-03-13 Thread Philip Martin
Philip Martin writes: > Pravin Rane writes: > >> /tmp/buildd/subversion-1.6.12dfsg/subversion/libsvn_subr/path.c:414: >> svn_path_is_empty: Assertion `is_canonical(path, strlen(path))' failed. >> Aborted > > 1.6 is old. It's still a problem on trunk, we need to canonicalize the svn:sync-from-ur

Re: svn sync error svn_path_is_empty

2014-03-13 Thread Philip Martin
Pravin Rane writes: > /tmp/buildd/subversion-1.6.12dfsg/subversion/libsvn_subr/path.c:414: > svn_path_is_empty: Assertion `is_canonical(path, strlen(path))' failed. > Aborted 1.6 is old. > Following are the properties of slave repo. > > svn01-mel:/var/lib/svn# svn pl --revprop -v -r 0 --usernam

svn sync error svn_path_is_empty

2014-03-13 Thread Pravin Rane
Hi, I am trying to create Write-through proxying using docs @ link: http://svnbook.red-bean.com/en/1.7/svn.serverconfig.httpd. html#svn.serverconfig.httpd.extra.writethruproxy I took dump of master repo and imported it on slave repo. I configured pre_revprop_change hook and changed UUID and sync U

Re: Not enough infer to resolve 'loaded an incompatible library'

2014-03-13 Thread Philip Martin
Torsten Budesheim writes: > svn: E200019: ra_serf was compiled for serf 1.3.4 but loaded an incompatible > 1.1.1 library > > > How can I identify the incompatible version 1.1.1 library that is > being loaded and/or how do I fix this? I think OSX uses dyld and so setting DYLD_PRINT_LIBRARIES sho

RE: preserved-conflict-file-exts

2014-03-13 Thread Bert Huijben
> -Original Message- > From: Bert Huijben [mailto:b...@qqmail.nl] > Sent: donderdag 13 maart 2014 11:52 > To: 'Magnus Carlsson'; users@subversion.apache.org > Subject: RE: preserved-conflict-file-exts > > > -Original Message- > > From: Magnus Carlsson [mailto:cula...@gmail.com] >

Re: Not enough infer to resolve 'loaded an incompatible library'

2014-03-13 Thread Mark Phippard
I had a similar problem with Homebrew. In my case, SVN still worked but it was using an older version of Serf than 1.3.4. I think this is because Homebrew used to have Serf as a package and SVN used it. They then changed the packaging so that Serf is a private library of the Subversion package.

Not enough infer to resolve 'loaded an incompatible library'

2014-03-13 Thread Torsten Budesheim
Hi, I’m trying to resolve an issue I’m having with subversion on my Mac OS 10.9.2. I installed subversion via Homebrew and it had previously worked. I can’t say for sure anymore what exactly happened, but recently this is what happened (not necessarily in exactly that order): 1) Installed the

commit_util.c Assertion failed (repos_root_url && repos_relpath)

2014-03-13 Thread Rex Ng
Hi all, Today I ran into the following exception when I tried to commit using --- Subversion Exception! --- Subversion encountered a serious problem. Please take the time to report this on the Subversion mailing list with as much informatio

RE: preserved-conflict-file-exts

2014-03-13 Thread Bert Huijben
> -Original Message- > From: Magnus Carlsson [mailto:cula...@gmail.com] > Sent: donderdag 13 maart 2014 11:02 > Subject: preserved-conflict-file-exts > > Hi, > > I have an issue with the setting: preserved-conflict-file-exts from > the subversion config file. > > I'm using svn 1.8.8 (r1

preserved-conflict-file-exts

2014-03-13 Thread Magnus Carlsson
Hi, I have an issue with the setting: preserved-conflict-file-exts from the subversion config file. I'm using svn 1.8.8 (r1568071) I have some files that has the extension .TcPOU I have a special compare & merge utility for these files. Unfortunately the compare & merge tool first starts with ch