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 then went ahead and ran the merge, results below.
Ignore some of the syntax details because the Eclipse output is a
pseudo-console.
The merge ran a lot faster than I thought it would, which is nice.
One thing that was concerning is the inconsistent handling of
'C'onflicts Note how it stopped the merge (correctly) the first time
it had a conflict. And then later when I resumed the merge it did
not.
Anyway, this is all just trivia and fyi at the moment. I am going to
hand this over to Senthil to do the merges for real.
merge -c 30656 -c 30760 -c 31046 -r 31049:31053 -c 31117 -r
31240:31245 -r 31258:31261 -r 31288:31291 -c 31308 -c 31337 -c 31361
-c 31367 -c 31370 -r 31426:31428 -c 31446 -c 31449 -c 31513 -r
31514:31522 -c 31539 -r 31541:31543 -r 31746:31752 -c 31854 -c 31861
-c 32083 -c 32132 -r 32143:32145 -r 32203:32205 -c 32207 -c 32330 -c
32404 http://svn.collab.net/repos/svn/trunk
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
--- Merging r30655 through r30656 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
U /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/cmdline.c
--- Merging r30759 through r30760 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
U /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/simple_providers.c
--- Merging r31045 through r31046 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
U /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_ra/ra_loader.c
U /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/include/svn_config.h
U /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/include/svn_cmdline.h
U /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/include/svn_auth.h
U /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/config_file.c
U /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/config.c
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/cmdline.c
U /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/prompt.c
U /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/auth.c
G /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 /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/tools/server-side/svn_server_log_parse.py
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
--- Merging r31049 through r31053 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/cmdline.c
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/prompt.c
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/simple_providers.c
U /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/tests/cmdline/svntest/main.py
--- Merging r31116 through r31117 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/simple_providers.c
--- Merging r31240 through r31242 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
U /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/Makefile.in
U /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/build.conf
A /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/include/svn_auth_dso.h
A /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/include/private/svn_auth_private.h
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/include/svn_auth.h
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/cmdline.c
C /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/simple_providers.c
A /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_auth_kwallet
A /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_auth_kwallet/kwallet.cpp
U /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/build/generator/gen_base.py
Skipped /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/tools/server-side/test_svn_server_log_parse.py
Skipped /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/tools/server-side/svn_server_log_parse.py
U /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/configure.ac
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
A conflict in the working copy obstructs the current operation
svn: One or more conflicts were produced while merging r31240:31242 into
'/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion' --
resolve all conflicts and rerun the merge to apply the remaining
unmerged revisions
Merge completed abnormally.
===== File Statistics: =====
Conflicts: 1
Merged: 8
Added: 4
Updated: 16
==== Property Statistics: =====
Merged: 2
resolve --accept=working
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/simple_providers.c
Resolved conflicted state of
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/simple_providers.c
merge -c 30656 -c 30760 -c 31046 -r 31049:31053 -c 31117 -r
31240:31245 -r 31258:31261 -r 31288:31291 -c 31308 -c 31337 -c 31361
-c 31367 -c 31370 -r 31426:31428 -c 31446 -c 31449 -c 31513 -r
31514:31522 -c 31539 -r 31541:31543 -r 31746:31752 -c 31854 -c 31861
-c 32083 -c 32132 -r 32143:32145 -r 32203:32205 -c 32207 -c 32330 -c
32404 http://svn.collab.net/repos/svn/trunk
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
--- Merging r31243 through r31245 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/build.conf
--- Merging r31258 through r31261 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/cmdline.c
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/configure.ac
--- Merging r31288 through r31291 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/cmdline.c
C /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/bindings/javahl/native/SVNClient.cpp
U /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/bindings/javahl/native/Prompter.cpp
--- Merging r31307 through r31308 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
U /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/ssl_server_trust_providers.c
--- Merging r31336 through r31337 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/Makefile.in
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/build.conf
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/cmdline.c
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/simple_providers.c
A /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_auth_gnome_keyring
A /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/bindings/javahl/native/SVNClient.cpp
U /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/include/svn_auth_dso.h
--- Merging r31336 through r31337 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/include/private/svn_auth_private.h
U /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/include/private/svn_auth_private.h
Skipped /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/tools/server-side/test_svn_server_log_parse.py
Skipped /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/tools/server-side/svn_server_log_parse.py
--- Merging r31336 through r31337 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/configure.ac
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
--- Merging r31360 through r31361 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/cmdline.c
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/bindings/javahl/native/SVNClient.cpp
--- Merging r31366 through r31367 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/cmdline.c
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/bindings/javahl/native/SVNClient.cpp
--- Merging r31369 through r31370 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/bindings/javahl/native/SVNClient.cpp
--- Merging r31426 through r31428 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/config_file.c
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/cmdline.c
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/include/svn_config.h
--- Merging r31426 through r31428 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_auth_kwallet/kwallet.cpp
U /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_auth_kwallet/kwallet.cpp
--- Merging r31445 through r31446 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/cmdline.c
--- Merging r31448 through r31449 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/simple_providers.c
--- Merging r31512 through r31513 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
U /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
--- Merging r31514 through r31515 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/config_file.c
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/cmdline.c
--- Merging r31516 through r31522 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/cmdline.c
--- Merging r31538 through r31539 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_auth_kwallet/kwallet.cpp
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_auth_kwallet/kwallet.cpp
--- Merging r31541 through r31543 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/cmdline.c
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/bindings/javahl/native/SVNClient.cpp
--- Merging r31746 through r31748 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/config_file.c
--- Merging r31749 through r31752 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
U /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/include/svn_error_codes.h
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/include/svn_config.h
C /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/config.c
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/cmdline.c
--- Merging r31853 through r31854 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/bindings/javahl/native/SVNClient.cpp
--- Merging r31853 through r31854 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_auth_kwallet/kwallet.cpp
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_auth_kwallet/kwallet.cpp
--- Merging r31860 through r31861 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_auth_kwallet/kwallet.cpp
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_auth_kwallet/kwallet.cpp
--- Merging r32082 through r32083 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/simple_providers.c
--- Merging r32131 through r32132 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_ra/ra_loader.c
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/config_file.c
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/cmdline.c
U /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
C /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/prompt.c
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/include/svn_config.h
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/include/svn_auth_dso.h
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/include/svn_cmdline.h
--- Merging r32131 through r32132 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/include/private/svn_auth_private.h
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/include/private/svn_auth_private.h
--- Merging r32131 through r32132 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/include/svn_auth.h
U /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_ra_neon/session.c
--- Merging r32143 through r32145 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/config_file.c
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/ssl_server_trust_providers.c
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/simple_providers.c
--- Merging r32203 through r32205 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
U /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/username_providers.c
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/ssl_server_trust_providers.c
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/simple_providers.c
--- Merging r32206 through r32207 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/username_providers.c
--- Merging r32329 through r32330 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
G /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/libsvn_subr/simple_providers.c
--- Merging r32403 through r32404 into
/Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion
U /Users/mphippard/Documents/workspaces/collabnet-3.3/Subversion/subversion/bindings/javahl/native/JNIUtil.cpp
Merge complete.
===== File Statistics: =====
Conflicts: 3
Merged: 51
Added: 2
Updated: 11
==== Property Statistics: =====
Merged: 1
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
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-11 22:15:00 CEST