Client certificate authentication fails with SVN and OpenSSL 1.0.1

2013-06-17 Thread gadamiak
My Subversion repositories running under Apache 2.2.22 on Ubuntu Server 12.04 amd64 can't be accessed any more with TortoiseSVN above 1.7.6 when client certificate authentication is required. The same happens when using CLI client (svn 1.7.5) shipped with TortoiseSVN. I described the issue in d

Ancestrally Related Error Message

2013-06-17 Thread C M
Hello, Code for a new development effort was imported into a developer’s branch. Now we want merge his changes to trunk (which is currently empty). I tried the merge from both the command line and the Tortoise GUI and keep running into the “…must be ancestrally related…” message.I also tried the

RE: Ancestrally Related Error Message

2013-06-17 Thread Bob Archer
> Hello, > Code for a new development effort was imported into a developer's branch. > Now we want merge his changes to trunk (which is currently empty). > I tried the merge from both the command line and the Tortoise GUI and keep > running into the "...must be ancestrally related..." message.I als

Re: Ancestrally Related Error Message

2013-06-17 Thread C. Michael Pilato
On 06/17/2013 11:19 AM, C M wrote: > Hello, > > Code for a new development effort was imported into a developer’s branch. > > Now we want merge his changes to trunk (which is currently empty). > > I tried the merge from both the command line and the Tortoise GUI and keep > running into the “…mus

Re: Ancestrally Related Error Message

2013-06-17 Thread C M
I think my earlier mistake might have been that I was using the --reintegrate option. Without it, I make some progress, but still not quite what I am expecting. Again, given that trunk is empty, why the "C" (tree conflicts)? I would expect all of then to be "A" (additions), no? The DEV_WC current

RE: Ancestrally Related Error Message

2013-06-17 Thread Bob Archer
Did you try it without using Dry Run... I have found at times that can cause issues. There's really no need to use dry run since you can just revert. Just make sure you have no pending changes in your target working copy. From: C M [mailto:cmanalys...@gmail.com] Sent: Monday, June 17, 2013 12:39

Re: Ancestrally Related Error Message

2013-06-17 Thread C. Michael Pilato
On 06/17/2013 12:39 PM, C M wrote: > I think my earlier mistake might have been that I was using the > --reintegrate option. > Without it, I make some progress, but still not quite what I am expecting. > > Again, given that trunk is empty, why the "C" (tree conflicts)? I would > expect all of then

Re: Ancestrally Related Error Message

2013-06-17 Thread C M
Running without the dry-run option doesn't do anything different (it still reports the conflicts). Yes, the diff shows the content I am expecting (at least for the text files). I ran "svn diff -r1190:1245 --summarize https://path_to_branch/SCR_BR/"; and see output like: M path_to_file M path_to_f

RE: Ancestrally Related Error Message

2013-06-17 Thread Andrew Reedick
> From: C M [mailto:cmanalys...@gmail.com] > Sent: Monday, June 17, 2013 12:39 PM > To: C. Michael Pilato > Cc: Subversion > Subject: Re: Ancestrally Related Error Message > > I think my earlier mistake might have been that I was using the --reintegrate > option. > Without it, I make some prog

Re: Ancestrally Related Error Message

2013-06-17 Thread C M
We are on SVN 1.7.6. Trunk is empty because this is/was a new development effort. The code was directly imported into the developer's branch. I ran these two commans in the working copy and get the messages you mentioned. What does that mean? c:\Temp\DEV_WC>svn merge --dry-run --revision 1190:12

Re: Ancestrally Related Error Message

2013-06-17 Thread Les Mikesell
On Mon, Jun 17, 2013 at 12:59 PM, C M wrote: > We are on SVN 1.7.6. > > Trunk is empty because this is/was a new development effort. The code was > directly imported into the developer's branch. > > I ran these two commans in the working copy and get the messages you > mentioned. What does that me

Re: Ancestrally Related Error Message

2013-06-17 Thread C M
Well, for what its worth, I was able to complete the "merge" following steps 3 -6 in this article. http://kirenpillay.blogspot.com/2012/07/svn-merge-tree-conflict-resolution.html I don't understand why SVN behaved the way it did and prevented the branch to trunk merge as expected.. On Mon, J

Re: History in subversion

2013-06-17 Thread Olivier Antoine
Hi, >>> From: Ryan Schmidt > On the other hand, let's say you've made changes and tested them and try to commit and it fails because a file is out of date. > You wish you had made a feature branch for these changes. No problem; you can still do it now. > Use "svn info" on the working copy to fin

Re: History in subversion

2013-06-17 Thread Les Mikesell
On Mon, Jun 17, 2013 at 4:09 PM, Olivier Antoine wrote: > >> The common scenario is to have multiple 'projects' under the same >> repository root, each with their own trunk/branches/tags tree. > > To be honest, I'm afraid of several projects sharing a same revision > numbering. > Repository gets b