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

Re: svn commit: r942802 - in /subversion/trunk/subversion: libsvn_client/commit_util.c tests/cmdline/merge_tests.py

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Mon, 10 May 2010 13:34:21 -0400

Philip Martin wrote:
> $ svn diff -cr942802 ../src/subversion/tests/cmdline/merge_tests.py
> Index: ../src/subversion/tests/cmdline/merge_tests.py
> ===================================================================
> --- ../src/subversion/tests/cmdline/merge_tests.py (revision 942801)
> +++ ../src/subversion/tests/cmdline/merge_tests.py (revision 942802)
> @@ -3009,7 +3009,6 @@
> expected_output = svntest.wc.State(wc_dir, {
> 'A/C' : Item(verb='Sending'),
> 'A/C/foo' : Item(verb='Replacing'),
> - 'A/C/foo/bar' : Item(verb='Adding'),
> })
>
> expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
> @@ -3029,6 +3028,16 @@
> expected_status,
> None, wc_dir)
>
>
> It's a merge that replaces a directory. The commit used to generate
> an 'Adding' notification for one of the chidren. The change in the
> repository looks like:
>
> $ svn log -vqrhead file://`pwd`/svn-test-work/repositories/merge_tests-34/
> ------------------------------------------------------------------------
> r6 | jrandom | 2010-05-10 17:39:24 +0100 (Mon, 10 May 2010)
> Changed paths:
> M /A/C
> R /A/C/foo (from /A/B/F/foo:5)
>
> A/C/foo/bar is not explicitly changed and that was also the case
> before r942802.

I asked about this because commit notification and action are pretty
intimately entangled: if the notification is different, we almost certainly
changed what got sent thru the commit editor, too. That may be fine in this
case, but I just want to ensure that you've done the necessary thoughtwork
around cases that may not be represented in our test suite. (No specific
tricky cases come to mind right now.)

Does this mean that we no longer have the weirdness that 'svn cp REPOS WC'
would create a tree like this:

    WC/target # scheduled as a real copy target
    WC/target/subthing # annotated as 'copied', but not a copy target
    WC/target/subthing2 # annotated as 'copied', but not a copy target
    ...

but an 'svn merge' that adds a tree would do this:

    WC/target # scheduled as a real copy target
    WC/target/subthing # scheduled as a real copy target
    WC/target/subthing2 # scheduled as a real copy target
    ...

?

-- 
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand

Received on 2010-05-10 19:34:55 CEST

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