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

Re: svn commit: r33016 - trunk/subversion/tests/cmdline

From: Paul Burba <ptburba_at_gmail.com>
Date: Wed, 10 Sep 2008 16:27:55 -0400

On Wed, Sep 10, 2008 at 4:01 PM, Paul Burba <ptburba_at_gmail.com> wrote:
> On Wed, Sep 10, 2008 at 1:56 PM, C. Michael Pilato <cmpilato_at_collab.net> wrote:
>> pburba_at_tigris.org wrote:
>>> Author: pburba
>>> Date: Wed Sep 10 10:47:35 2008
>>> New Revision: 33016
>>>
>>> Log:
>>> Follow-up to r33013, correct XFailing test expectation.
>>>
>>> * subversion/tests/cmdline/merge_tests.py
>>> (natural_history_filtering): The revision a copy if committed is *not* part
>>> of the copy's natural history on the source.
>>
>> Paul, can you say this with ... different words? :-)
>
> Mike,
>
> I just tweaked the log message to:
>
> [[[
> Follow-up to r33013, correct XFailing test expectation.
>
> * subversion/tests/cmdline/merge_tests.py
> (natural_history_filtering): A_COPY_2 was copied from A_at_6 and committed
> in r7 and thus '/A:7' is not part of A_COPY_2's natural history. So when
> we merge all available revisions from A_COPY to A_COPY_2, which tries to
> add the mergeinfo '/A:2-9' to A_COPY_2, we expect the filtered mergeinfo
> to be '/A:7-8' not '/A:8'.
> ]]]
>
> Does that make more sense?

I missed my original typo where 'if' should have been 'is'. So I
over-explained. Thanks to kfogel's mockery I get it now. How's this?

[[[
Follow-up to r33013, correct XFailing test expectation.

* subversion/tests/cmdline/merge_tests.py
  (natural_history_filtering): The revision in which a copy is committed is
  *not* part of the copy's natural history from the copy source.
]]]

Paul

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-10 22:28:13 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.