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

Re: svn commit: r28816 - branches/reintegrate/subversion/tests/cmdline

From: David Glasser <glasser_at_davidglasser.net>
Date: Wed, 9 Jan 2008 11:39:12 -0500

On Jan 8, 2008 9:00 PM, <kfogel_at_tigris.org> wrote:
> Author: kfogel
> Date: Tue Jan 8 18:00:15 2008
> New Revision: 28816
>
> Log:
> On the reintegrate branch:
>
> * subversion/tests/cmdline/merge_tests.py
> (reintegrate_fail_on_stale_source): New test.
> (test_list): Run it XFail.
>
>
> Modified:
> branches/reintegrate/subversion/tests/cmdline/merge_tests.py
>
> Modified: branches/reintegrate/subversion/tests/cmdline/merge_tests.py
> URL: http://svn.collab.net/viewvc/svn/branches/reintegrate/subversion/tests/cmdline/merge_tests.py?pathrev=28816&r1=28815&r2=28816
> ==============================================================================
> --- branches/reintegrate/subversion/tests/cmdline/merge_tests.py (original)
> +++ branches/reintegrate/subversion/tests/cmdline/merge_tests.py Tue Jan 8 18:00:15 2008
> @@ -9958,6 +9958,25 @@
> ".*Cannot reintegrate into a working copy not.*at infinite depth.*",
> None, None, None, None, True, False, '--reintegrate')
>
> +def reintegrate_fail_on_stale_source(sbox):
> + "merge --reintegrate should fail on stale source"
> + sbox.build()
> + wc_dir = sbox.wc_dir
> + expected_disk, expected_status = set_up_branch(sbox)
> + A_path = os.path.join(wc_dir, "A")
> + mu_path = os.path.join(A_path, "mu")
> + svntest.main.file_append(mu_path, 'some text appended to mu\n')
> + svntest.actions.run_and_verify_svn(None, None, [], 'commit',
> + '-m', 'a change to mu', mu_path);
> + # Unmix the revisions in the working copy.
> + svntest.actions.run_and_verify_svn(None, None, [], 'update', wc_dir);
> + # The merge --reintegrate should fail because target has changes not
> + # present in source.
> + svntest.actions.run_and_verify_merge(
> + A_path, None, None, sbox.repo_url + '/A_COPY', None, None, None, None,
> + ".*", ###TODO(reint): need a more specific check here
> + None, None, None, None, True, False, '--reintegrate')
> +
>
> ########################################################################
> # Run the tests
> @@ -10052,6 +10071,7 @@
> reintegrate_fail_on_mixed_rev_wc,
> reintegrate_fail_on_switched_wc,
> reintegrate_fail_on_shallow_wc,
> + XFail(reintegrate_fail_on_stale_source),
> ]

Wait, really? The target may have more changes, but they all are at
"the end". --reintegrate should choose the left-hand URL to be the
copy source of the branch, and successfully merge the (lack of)
changes from the branch to the target.

(Also, you need to merge-kluge here, right?)

--dave

-- 
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-01-09 17:42:23 CET

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