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

[Greg Stein <gs...@gmail.com>]

On Mon, May 10, 2010 at 13:34, C. Michael Pilato <cm...@collab.net> wrote:
>...
> 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

Agreed!

I also worry when I see the commit output changing.

> 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
>    ...

The merge tree output might not happen as much any more. See
notes/api-errata/wc003.txt

Cheers,
-g

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

[Philip Martin <ph...@wandisco.com>]

Greg Stein <gs...@gmail.com> writes:

> On Mon, May 10, 2010 at 13:34, C. Michael Pilato <cm...@collab.net> wrote:
>>...
>> 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
>
> Agreed!
>
> I also worry when I see the commit output changing.

Me too, but in this case the old notification looked suspect.  Commit
used to send "extra" notifications for children of a directory added
by merge, but in this case it was only sending extra notification for
the directory child, not the file children.

-- 
Philip