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
detail.
> I then went ahead and ran the merge, results below.
>
> Ignore some of the syntax details because the Eclipse output is a
> pseudo-console.
>
[..]
>
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/simple_providers.c
> U
>
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/config_auth.c
> Skipped
>
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/tools/server-side/test_svn_server_log_parse.py
> 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.
Lieven
----------------------------------------------------------------
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