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

Re: svn commit: r1304614 - /subversion/trunk/subversion/libsvn_client/merge.c

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Tue, 27 Mar 2012 14:38:20 +0100

Philip Martin <philip.martin_at_wandisco.com> writes:

> What's going on?

The change fixes the test by causing the -r9:1 merge to be done in the
"right" way as -r8:6 then -r6:1

With r1304614 I see the two sub-ranges merged:

2012-03-27 14:34:00 [INFO] CMD: svn merge file:///home/pm/sw/subversion/obj2/subversion/tests/cmdline/svn-test-work/repositories/merge_tests-127/trunk svn-test-work/working_copies/merge_tests-127/A_COPY -r9:1 --config-dir /home/pm/sw/subversion/obj2/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom
2012-03-27 14:34:00 [INFO] <TIME = 0.089607>
2012-03-27 14:34:00 [INFO] --- Reverse-merging r8 through r7 into 'svn-test-work/working_copies/merge_tests-127/A_COPY':
2012-03-27 14:34:00 [INFO] U svn-test-work/working_copies/merge_tests-127/A_COPY/D/H/omega
2012-03-27 14:34:00 [INFO] --- Recording mergeinfo for reverse merge of r8 through r7 into 'svn-test-work/working_copies/merge_tests-127/A_COPY':
2012-03-27 14:34:00 [INFO] U svn-test-work/working_copies/merge_tests-127/A_COPY
2012-03-27 14:34:00 [INFO] --- Reverse-merging r6 through r2 into 'svn-test-work/working_copies/merge_tests-127/A_COPY':
2012-03-27 14:34:00 [INFO] U svn-test-work/working_copies/merge_tests-127/A_COPY/B/E/beta
2012-03-27 14:34:00 [INFO] U svn-test-work/working_copies/merge_tests-127/A_COPY/D/G/rho
2012-03-27 14:34:00 [INFO] G svn-test-work/working_copies/merge_tests-127/A_COPY/D/H/omega
2012-03-27 14:34:00 [INFO] U svn-test-work/working_copies/merge_tests-127/A_COPY/D/H/psi
2012-03-27 14:34:00 [INFO] --- Recording mergeinfo for reverse merge of r6 through r2 into 'svn-test-work/working_copies/merge_tests-127/A_COPY':
2012-03-27 14:34:00 [INFO] G svn-test-work/working_copies/merge_tests-127/A_COPY
2012-03-27 14:34:00 [INFO] --- Eliding mergeinfo from 'svn-test-work/working_copies/merge_tests-127/A_COPY':
2012-03-27 14:34:00 [INFO] U svn-test-work/working_copies/merge_tests-127/A_COPY

and with r1304613 I see just the second sub-range:

2012-03-27 14:32:51 [INFO] CMD: svn merge file:///home/pm/sw/subversion/obj/subversion/tests/cmdline/svn-test-work/repositories/merge_tests-127/trunk svn-test-work/working_copies/merge_tests-127/A_COPY -r9:1 --config-dir /home/pm/sw/subversion/obj/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom
2012-03-27 14:32:51 [INFO] CMD: /home/pm/sw/subversion/obj/subversion/svn/svn merge file:///home/pm/sw/subversion/obj/subversion/tests/cmdline/svn-test-work/repositories/merge_tests-127/trunk svn-test-work/working_copies/merge_tests-127/A_COPY -r9:1 --config-dir /home/pm/sw/subversion/obj/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom exited with 1
2012-03-27 14:32:51 [INFO] <TIME = 0.080884>
2012-03-27 14:32:51 [INFO] --- Reverse-merging r6 through r2 into 'svn-test-work/working_copies/merge_tests-127/A_COPY':
2012-03-27 14:32:51 [INFO] U svn-test-work/working_copies/merge_tests-127/A_COPY/B/E/beta
2012-03-27 14:32:51 [INFO] U svn-test-work/working_copies/merge_tests-127/A_COPY/D/G/rho
2012-03-27 14:32:51 [INFO] C svn-test-work/working_copies/merge_tests-127/A_COPY/D/H/omega
2012-03-27 14:32:51 [INFO] U svn-test-work/working_copies/merge_tests-127/A_COPY/D/H/psi
2012-03-27 14:32:51 [INFO] --- Recording mergeinfo for reverse merge of r6 through r2 into 'svn-test-work/working_copies/merge_tests-127/A_COPY':
2012-03-27 14:32:51 [INFO] U svn-test-work/working_copies/merge_tests-127/A_COPY
2012-03-27 14:32:51 [INFO] Summary of conflicts:
2012-03-27 14:32:51 [INFO] Text conflicts: 1
2012-03-27 14:32:51 [INFO] ../src/subversion/svn/util.c:913: (apr_err=155015)
2012-03-27 14:32:51 [INFO] ../src/subversion/libsvn_client/merge.c:10873: (apr_err=155015)
2012-03-27 14:32:51 [INFO] ../src/subversion/libsvn_client/merge.c:10837: (apr_err=155015)
2012-03-27 14:32:51 [INFO] ../src/subversion/libsvn_client/merge.c:8989: (apr_err=155015)
2012-03-27 14:32:51 [INFO] ../src/subversion/libsvn_client/merge.c:4734: (apr_err=155015)
2012-03-27 14:32:51 [INFO] svn: E155015: One or more conflicts were produced while merging r6:1 into
2012-03-27 14:32:51 [INFO] '/home/pm/sw/subversion/obj/subversion/tests/cmdline/svn-test-work/working_copies/merge_tests-127/A_COPY' --
2012-03-27 14:32:51 [INFO] resolve all conflicts and rerun the merge to apply the remaining
2012-03-27 14:32:51 [INFO] unmerged revisions

-- 
uberSVN: Apache Subversion Made Easy
http://www.uberSVN.com
Received on 2012-03-27 15:39:00 CEST

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