Re: Is it safe to redirect from HTTP to HTTPS in case of svn:externals?

2015-08-19 Thread Thorsten Schöning
Guten Tag Bert Huijben, am Mittwoch, 19. August 2015 um 22:06 schrieben Sie: > The key Subversion uses to store passwords is different between > http and https, so a password used for https won't be used for http. It's bit late for me, so: This is good thing in my setup, right? :-) > There are o

RE: Is it safe to redirect from HTTP to HTTPS in case of svn:externals?

2015-08-19 Thread Bert Huijben
> -Original Message- > From: Thorsten Schöning [mailto:tschoen...@am-soft.de] > Sent: woensdag 19 augustus 2015 21:50 > To: users@subversion.apache.org > Subject: Is it safe to redirect from HTTP to HTTPS in case of svn:externals? > > Hi, > > I'm implementing publicly accessible mod_dav

Is it safe to redirect from HTTP to HTTPS in case of svn:externals?

2015-08-19 Thread Thorsten Schöning
Hi, I'm implementing publicly accessible mod_davn_svn in addition to some internally used svnserve. Some of my repos use svn:externals where we used to defined "//internal.example.org/...", my publicly available entry point is "https://external.example.org";. For the public "internal.example.org"

RE: Two-step merge ok, one-step merge conflicts

2015-08-19 Thread Andrew Reedick
> -Original Message- > From: Timur Khanipov [mailto:khani...@gmail.com] > Sent: Wednesday, August 19, 2015 1:20 PM > To: users@subversion.apache.org > Cc: Иван Коптелов > Subject: Two-step merge ok, one-step merge conflicts > > Hi folks. > > I faced the following problem. The command >

Two-step merge ok, one-step merge conflicts

2015-08-19 Thread Timur Khanipov
Hi folks. I faced the following problem. The command svn merge -r 3:4 -r 4:5 ^^/trunk works smoothly while command svn merge -r 3:5 ^^/trunk results in a text conflict. This seems like a buggy behavior (since the two merges are equivalent). I reproduced it in a simple situation when trunk con

Re: JavaHL logMessages only one callback

2015-08-19 Thread Mark Phippard
On Wed, Aug 19, 2015 at 11:18 AM, corneil.duples...@gmail.com < corneil.duples...@gmail.com> wrote: > Thanks, the following worked and only difference was the order of the > callbacks. > > RevisionRange(Revision.getInstance(0), Revision.HEAD) > RevisionRange(Revision.HEAD, Revision.getInstance(0))

Re: JavaHL logMessages only one callback

2015-08-19 Thread corneil.duples...@gmail.com
Thanks, the following worked and only difference was the order of the callbacks. RevisionRange(Revision.getInstance(0), Revision.HEAD) RevisionRange(Revision.HEAD, Revision.getInstance(0)) Corneil du Plessis about.me/corneil On 19 August 2015 at 11:04, Branko Čibej wrote: > > On 19.08.2015 1

Re: Subversion Error During Update

2015-08-19 Thread Andreas Stieger
Hello, James Trainor wrote: > While attempting update the trunk of https://github.com/EllisLab/CodeIgniter > I received the following error. >   > In file > 'D:\Development\SVN\Releases\TortoiseSVN-1.8.8\ext\subversion\subversion\libsvn_wc\update_editor.c' > line 1550: assertion failed (action ==

Re: JavaHL logMessages only one callback

2015-08-19 Thread Branko Čibej
On 19.08.2015 10:48, corneil.duples...@gmail.com wrote: > I am trying to find change history and thought that using logMessage will > provide the information. > > I am using a call as descibre below: > > pegRevision = Revision.HEAD, > ranges = [RevisionRange(Revision.HEAD, Revision.START)] > stopOn

JavaHL logMessages only one callback

2015-08-19 Thread corneil.duples...@gmail.com
I am trying to find change history and thought that using logMessage will provide the information. I am using a call as descibre below: pegRevision = Revision.HEAD, ranges = [RevisionRange(Revision.HEAD, Revision.START)] stopOnCopy = false discoverPath = true includeMergedRevisions = true props =

Subversion Error During Update

2015-08-19 Thread Trainor, James
While attempting update the trunk of https://github.com/EllisLab/CodeIgniter I received the following error. --- Subversion Exception! --- Subversion encountered a serious problem. Please take the time to report this on the Subversion mailing list w