Hi,
I have posted details of the following here while I investigate what's
happening.
I've looked through the current bugs but have not found anything similar. It is
a few years since I last looked at the documentation, so I also going through
what's available to see if there is anything obvio
I'm trying out subversion 1.10 and it's going both good and bad.
The good thing is that new interactive conflict resolver works absolutely
brilliantly for text conflicts. Great job everyone!
The bad news is that I can't resolve my tree conflicts.
Let me prefix this with saying that the corporate
On Wed, Apr 25, 2018 at 11:04:13AM +, Chris wrote:
> I'm trying out subversion 1.10 and it's going both good and bad.
>
> The good thing is that new interactive conflict resolver works absolutely
> brilliantly for text conflicts. Great job everyone!
> The bad news is that I can't resolve my t
On Wed, Apr 25, 2018 at 11:23 AM, Sobo77 wrote:
> Hi,
>
> I have posted details of the following here while I investigate what's
> happening.
>
> I've looked through the current bugs but have not found anything similar. It
> is a few years since I last looked at the documentation, so I also going
Hi Stefan and thanks for the reply.
(sorry about the top-posting, yahoo's webmail isn't made for proper mail usage)
Good idea to try the non-interactive and then resolve after, that seems to get
me out of the bind I got into, but I'll probably tell our users to stick to 1.9
for the time being.
Nico Kadel-Garcia wrote:
In general, to jump that many major revisions, I tend to use "svnsync"
to allow the repositories to stay synchronized while the client stays
talking to the first repository, then take the first repository
entirely offline. Note that this is probably the first opportunity,
On Wed, Apr 25, 2018 at 2:46 PM, Sobo77 wrote:
> Many thanks.
>
> P.S.
>
> A little thank you to all involved for your work on Subversion over the
> years.
I'm gladly forwarding your reply to the list (you replied only to me).
You're welcome :-).
--
Johan
On Apr 25, 2018, at 07:15, OBones wrote:
> Nico Kadel-Garcia wrote:
>> In general, to jump that many major revisions, I tend to use "svnsync"
>> to allow the repositories to stay synchronized while the client stays
>> talking to the first repository, then take the first repository
>> entirely off
I'm on Tortoise SVN 1.10 and I'm getting this exception trying to resolve
any merge conflict from a merge:
---
Subversion Exception!
---
Subversion encountered a serious problem.
Please take the time to report this on the Subversion mailing list
with
Hi again,
I'm attaching a script that reproduces the behavior of checking revisions
before the branch was created as well as going back to the revision before the
file was created on trunk.
If you run the attached script and redirect the output to file, you'll see this:
--- Merging r3 through r
10 matches
Mail list logo
