-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Mark Phippard wrote:
> 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 committed in r32449. Apart from the revisions you've mentioned, I need to
pull in changes from r31739 and r31931.
The output while I did this merge is as follows:
<snip>
$ svn 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
- -c 31739 -r 31746:31752 -c 31854 -c 31861 -c 31931 -c 32083 -c 32132 -r
32143:32145 -r 32203:32205 -c 32207 -c 32330 -c 32404
http://svn.collab.net/repos/svn/trunk
- --- Merging r30656 into '.':
U subversion/libsvn_subr/cmdline.c
- --- Merging r30760 into '.':
U subversion/libsvn_subr/simple_providers.c
- --- Merging r31046 into '.':
U subversion/libsvn_ra/ra_loader.c
U subversion/include/svn_config.h
U subversion/include/svn_cmdline.h
U subversion/include/svn_auth.h
U subversion/libsvn_subr/config_file.c
U subversion/libsvn_subr/config.c
G subversion/libsvn_subr/cmdline.c
U subversion/libsvn_subr/prompt.c
U subversion/libsvn_subr/auth.c
G subversion/libsvn_subr/simple_providers.c
U subversion/libsvn_subr/config_auth.c
Skipped missing target: 'tools/server-side/test_svn_server_log_parse.py'
Skipped missing target: 'tools/server-side/svn_server_log_parse.py'
G .
- --- Merging r31050 through r31053 into '.':
G subversion/libsvn_subr/cmdline.c
G subversion/libsvn_subr/prompt.c
G subversion/libsvn_subr/simple_providers.c
U subversion/tests/cmdline/svntest/main.py
- --- Merging r31117 into '.':
G subversion/libsvn_subr/simple_providers.c
- --- Merging r31241 through r31242 into '.':
U Makefile.in
U build.conf
A subversion/include/svn_auth_dso.h
A subversion/include/private/svn_auth_private.h
G subversion/include/svn_auth.h
G subversion/libsvn_subr/cmdline.c
Conflict discovered in 'subversion/libsvn_subr/simple_providers.c'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: e
Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: r
G subversion/libsvn_subr/simple_providers.c
A subversion/libsvn_auth_kwallet
A subversion/libsvn_auth_kwallet/kwallet.cpp
U build/generator/gen_base.py
Skipped missing target: 'tools/server-side/test_svn_server_log_parse.py'
Skipped missing target: 'tools/server-side/svn_server_log_parse.py'
U configure.ac
G .
- --- Merging r31244 through r31245 into '.':
G build.conf
- --- Merging r31259 through r31261 into '.':
G subversion/libsvn_subr/cmdline.c
G configure.ac
- --- Merging r31289 through r31291 into '.':
G subversion/libsvn_subr/cmdline.c
Conflict discovered in 'subversion/bindings/javahl/native/SVNClient.cpp'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: e
Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: r
U subversion/bindings/javahl/native/SVNClient.cpp
U subversion/bindings/javahl/native/Prompter.cpp
- --- Merging r31308 into '.':
U subversion/libsvn_subr/ssl_server_trust_providers.c
- --- Merging r31337 into '.':
G Makefile.in
G build.conf
G subversion/libsvn_subr/cmdline.c
G subversion/libsvn_subr/simple_providers.c
A subversion/libsvn_auth_gnome_keyring
A subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
G subversion/bindings/javahl/native/SVNClient.cpp
U subversion/include/svn_auth_dso.h
- --- Merging r31337 into 'subversion/include/private/svn_auth_private.h':
U subversion/include/private/svn_auth_private.h
Skipped missing target: 'tools/server-side/test_svn_server_log_parse.py'
Skipped missing target: 'tools/server-side/svn_server_log_parse.py'
- --- Merging r31337 into '.':
G configure.ac
G .
- --- Merging r31361 into '.':
G subversion/libsvn_subr/cmdline.c
G subversion/bindings/javahl/native/SVNClient.cpp
- --- Merging r31367 into '.':
G subversion/libsvn_subr/cmdline.c
G subversion/bindings/javahl/native/SVNClient.cpp
- --- Merging r31370 into '.':
G subversion/bindings/javahl/native/SVNClient.cpp
- --- Merging r31427 through r31428 into '.':
G subversion/libsvn_subr/config_file.c
G subversion/libsvn_subr/cmdline.c
G subversion/include/svn_config.h
- --- Merging r31427 through r31428 into
'subversion/libsvn_auth_kwallet/kwallet.cpp':
U subversion/libsvn_auth_kwallet/kwallet.cpp
- --- Merging r31446 into '.':
G subversion/libsvn_subr/cmdline.c
- --- Merging r31449 into '.':
G subversion/libsvn_subr/simple_providers.c
- --- Merging r31513 into '.':
U subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
- --- Merging r31515 into '.':
G subversion/libsvn_subr/config_file.c
G subversion/libsvn_subr/cmdline.c
- --- Merging r31517 through r31522 into '.':
G subversion/libsvn_subr/cmdline.c
- --- Merging r31539 into 'subversion/libsvn_auth_kwallet/kwallet.cpp':
G subversion/libsvn_auth_kwallet/kwallet.cpp
- --- Merging r31542 through r31543 into '.':
G subversion/libsvn_subr/cmdline.c
G subversion/bindings/javahl/native/SVNClient.cpp
- --- Merging r31739 into '.':
G subversion/libsvn_ra/ra_loader.c
G subversion/libsvn_subr/config.c
G subversion/libsvn_subr/simple_providers.c
U subversion/include/svn_error_codes.h
U subversion/libsvn_ra_serf/util.c
U subversion/libsvn_ra_neon/session.c
- --- Merging r31747 through r31748 into '.':
G subversion/libsvn_subr/config_file.c
- --- Merging r31750 through r31752 into '.':
G subversion/include/svn_error_codes.h
G subversion/include/svn_config.h
G subversion/libsvn_subr/config.c
G subversion/libsvn_subr/cmdline.c
- --- Merging r31854 into '.':
G subversion/bindings/javahl/native/SVNClient.cpp
- --- Merging r31854 into 'subversion/libsvn_auth_kwallet/kwallet.cpp':
G subversion/libsvn_auth_kwallet/kwallet.cpp
- --- Merging r31861 into 'subversion/libsvn_auth_kwallet/kwallet.cpp':
G subversion/libsvn_auth_kwallet/kwallet.cpp
- --- Merging r31931 into '.':
U subversion/libsvn_subr/error.c
G subversion/include/svn_error_codes.h
U subversion/include/svn_error.h
- --- Merging r32083 into '.':
G subversion/libsvn_subr/simple_providers.c
- --- Merging r32132 into '.':
G subversion/libsvn_ra/ra_loader.c
G subversion/libsvn_subr/config_file.c
G subversion/libsvn_subr/cmdline.c
U subversion/libsvn_subr/ssl_client_cert_pw_providers.c
Conflict discovered in 'subversion/libsvn_subr/prompt.c'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: e
Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: r
G subversion/libsvn_subr/prompt.c
G subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
G subversion/include/svn_config.h
G subversion/include/svn_auth_dso.h
G subversion/include/svn_cmdline.h
- --- Merging r32132 into 'subversion/include/private/svn_auth_private.h':
G subversion/include/private/svn_auth_private.h
- --- Merging r32132 into '.':
G subversion/include/svn_auth.h
G subversion/libsvn_ra_neon/session.c
- --- Merging r32144 through r32145 into '.':
G subversion/libsvn_subr/config_file.c
G subversion/libsvn_subr/ssl_client_cert_pw_providers.c
G subversion/libsvn_subr/ssl_server_trust_providers.c
G subversion/libsvn_subr/simple_providers.c
- --- Merging r32204 through r32205 into '.':
G subversion/libsvn_subr/ssl_client_cert_pw_providers.c
U subversion/libsvn_subr/username_providers.c
G subversion/libsvn_subr/ssl_server_trust_providers.c
G subversion/libsvn_subr/simple_providers.c
- --- Merging r32207 into '.':
G subversion/libsvn_subr/username_providers.c
- --- Merging r32330 into '.':
G subversion/libsvn_subr/simple_providers.c
- --- Merging r32404 into '.':
U subversion/bindings/javahl/native/JNIUtil.cpp
</snip>
Thank You.
- --
Senthil Kumaran S
http://www.stylesen.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFIoY5L9o1G+2zNQDgRAu7QAJ0VHMnT8BOqhKjh8ZxySCdRJeqFLACdGOf8
zhBq7TOV7Ur4Y7zVmKe8q8s=
=D2Ra
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
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 15:23:07 CEST