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

Re: merge_tests.py failure

From: <kfogel_at_collab.net>
Date: 2006-03-10 21:32:51 CET

kfogel@collab.net writes:
> Erem Írs <erem.ors@integral.com.tr> writes:
> > EXPECTED STDERR:
> > ACTUAL STDERR:
> > svn: Syntax error in revision argument 'COMMITTED:PREV'
> > EXCEPTION: SVNLineUnequal
> > FAIL: merge_tests.py 9: merge operations using PREV revision
>
> By the way, I looked at the test code and didn't see any reason why
> this should be a syntax error. But still can't test yet, as am
> building svn.

merge_tests.py 9 passes for me with today's head of trunk:

$ ./merge_tests.py -v 9
CMD: svnadmin "create" "svn-test-work/local_tmp/repos" "--bdb-txn-nosync" <TIME = 0.325255>
CMD: svn "import" "--username" "jrandom" "--password" "rayjandom" "-m" "Log message for revision 1." "svn-test-work/local_tmp/greekfiles" "file:///home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/repos" "--config-dir" "/home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config" <TIME = 0.863147>
CMD: svnadmin "create" "svn-test-work/repositories/merge_tests-9" "--bdb-txn-nosync" <TIME = 0.131940>
CMD: svnadmin dump "svn-test-work/local_tmp/repos" | svnadmin load "svn-test-work/repositories/merge_tests-9" <TIME = 0.075997>
CMD: svn "co" "--username" "jrandom" "--password" "rayjandom" "file:///home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/repositories/merge_tests-9" "svn-test-work/working_copies/merge_tests-9" "--config-dir" "/home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config" <TIME = 0.839103>
CMD: svn "add" "svn-test-work/working_copies/merge_tests-9/base1" "svn-test-work/working_copies/merge_tests-9/base2" "svn-test-work/working_copies/merge_tests-9/apply" "--config-dir" "/home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config" <TIME = 0.197194>
CMD: svn "ci" "-m" "rev 2" "svn-test-work/working_copies/merge_tests-9" "--config-dir" "/home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config" <TIME = 0.771486>
CMD: svn "merge" "--ignore-ancestry" "file:///home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/repositories/merge_tests-9/base1" "file:///home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/repositories/merge_tests-9/base2" "working_copies/merge_tests-9/apply" "--config-dir" "/home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config" <TIME = 0.185104>
CMD: svn "status" "-v" "-u" "-q" "--username" "jrandom" "--password" "rayjandom" "svn-test-work/working_copies/merge_tests-9/apply" "--config-dir" "/home/kfogel/src/subversion/subversion/tests/cmdline/svn-test-work/local_tmp/config" <TIME = 0.172636>
PASS: merge_tests.py 9: merging similar trees ancestrally unrelated
$

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Mar 10 23:21:58 2006

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