[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Special 1.5.x branch for issue2489 (SSL client certificate passphrase cache)

From: <svnlgo_at_mobsol.be>
Date: Tue, 12 Aug 2008 11:54:36 +0200

Quoting Mark Phippard <markphip_at_gmail.com>:

> Hi,
> I have created a new branch named 1.5.x-issue2489 to hold the custom
> backport of the changes needed to implement this feature in a custom
> version of 1.5.x. I copied the revision of 1.5.x used for 1.5.1 to
> start the branch.
> I then went through all of the trunk changes to find the revisions I
> *think* needs to be backported. I have attached the list that I came
> up with. I did this using our Eclipse merge client which makes both
> of these things easy to do. I am sure that I missed things like
> translations of new literals and likely changes to the test suite, and
> possibly things like the new error macros.

I doubt if tests exist for the gnome-keyring/kde-kwallet integration.

The rest of the resulting files merged look okay to me, but I didn't check in

> I then went ahead and ran the merge, results below.
> Ignore some of the syntax details because the Eclipse output is a
> pseudo-console.


> U
> Skipped
> Skipped
> Merge completed abnormally.
> ===== File Statistics: =====
> Conflicts: 1
> Merged: 8
> Added: 4
> Updated: 16
> ==== Property Statistics: =====
> Merged: 2
> resolve --accept=working

OT: Why don't the Skipped files show up in the merge results summary? These can
be the worst type of conflicts.


This message was sent using IMP, the Internet Messaging Program.

To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-08-12 11:54:52 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.