Author: julianfoad
Date: Fri Dec 7 12:43:10 2012
New Revision: 1418289
URL: http://svn.apache.org/viewvc?rev=1418289&view=rev
Log:
* subversion/tests/cmdline/merge_automatic_tests.py
(subtree_to_and_fro): Simplify a comment by eliding the repos root URL.
Modified:
subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py?rev=1418289&r1=1418288&r2=1418289&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py
(original)
+++ subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py Fri Dec
7 12:43:10 2012
@@ -804,21 +804,12 @@ def subtree_to_and_fro(sbox):
# not considered a merge. So the changes which exist on A/D and were
# merged to A_COPY/D, are merged *back* to A, resulting in a conflict:
#
- # C:\SVN\src-trunk\Debug\subversion\tests\cmdline\svn-test-work\
- # working_copies\merge_automatic_tests-18>svn merge ^^/A_COPY A
- # DBG: merge.c:11461: base on source: file:///C:/SVN/src-trunk/Debug/
- # subversion/tests/cmdline/svn-test-work/repositories/
- # merge_automatic_tests-18/A@1
- # DBG: merge.c:11462: base on target: file:///C:/SVN/src-trunk/Debug/
- # subversion/tests/cmdline/svn-test-work/repositories/
- # merge_automatic_tests-18/A@1
- # DBG: merge.c:11567: yca file:///C:/SVN/src-trunk/Debug/subversion/
- # tests/cmdline/svn-test-work/repositories/merge_automatic_tests-18/A@1
- # DBG: merge.c:11568: base file:///C:/SVN/src-trunk/Debug/subversion/
- # tests/cmdline/svn-test-work/repositories/merge_automatic_tests-18/A@1
- # DBG: merge.c:11571: right file:///C:/SVN/src-trunk/Debug/subversion/
- # tests/cmdline/svn-test-work/repositories/merge_automatic_tests-18/
- # A_COPY@8
+ # C:\...\working_copies\merge_automatic_tests-18>svn merge ^^/A_COPY A
+ # DBG: merge.c:11461: base on source: ^/A@1
+ # DBG: merge.c:11462: base on target: ^/A@1
+ # DBG: merge.c:11567: yca ^/A@1
+ # DBG: merge.c:11568: base ^/A@1
+ # DBG: merge.c:11571: right ^/A_COPY@8
# Conflict discovered in file 'A\D\H\psi'.
# Select: (p) postpone, (df) diff-full, (e) edit,
# (mc) mine-conflict, (tc) theirs-conflict,
