On Tue, Apr 1, 2008 at 10:42 AM, Paul Burba <ptburba_at_gmail.com> wrote:
> On Tue, Apr 1, 2008 at 9:49 AM, Julian Foad <julianfoad_at_btopenworld.com> wrote:
> >
<snip>
> > > On Mon, Mar 31, 2008 at 9:50 PM, Paul Burba <ptburba_at_gmail.com> wrote:
> > >> FWIW It will break merge_tests.py 19 and 60, but in both cases it
> > >> would just be a matter of tweaking the tests to agree with the new
> > >> meaning of --ignore-ancestry.
> >
> > I think my "make check" ran without failures, though I seem to have lost the
> > proof of having run it.
>
> Those tests fail only after r30145 (start recording mergeinfo for
> no-op merges) so you probably didn't see it.
Sorry, I meant merge_tests.py 19 and *30*, not 60. Patch to fix those
tests with your change:
[[[
* subversion/tests/cmdline/merge_tests.py
(merge_skips_obstructions, property_merge_undo_redo): Tweak these tests
to *not* expect mergeinfo changes when using --ignore-ancestry.
]]]
[[[
Index: merge_tests.py
===================================================================
--- merge_tests.py (revision 30158)
+++ merge_tests.py (working copy)
@@ -2000,7 +2000,7 @@
# this file, to understand why we use short_wc_dir and chdir() below.
expected_output = wc.State(short_wc_dir, { })
expected_disk.remove('A/B/lambda')
- expected_status.tweak('A/B/lambda', status='!M')
+ expected_status.tweak('A/B/lambda', status='! ')
os.chdir(svntest.main.work_dir)
expected_status.tweak('', status=' ')
# Why do we need to --ignore-ancestry? Because the previous merge of r4,
@@ -3314,13 +3314,11 @@
expected_output = wc.State(wc_dir, {'A/B/E/alpha' : Item(status=' C'), })
expected_disk = svntest.main.greek_state.copy()
- expected_disk.add({'' : Item(props={SVN_PROP_MERGEINFO : '/:2'}), })
expected_disk.add({'A/B/E/alpha.prej'
: Item("Trying to create property 'foo' with value 'foo_val',\n"
+ "but it has been locally deleted.\n")})
expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak('', status=' M')
expected_status.tweak('A/B/E/alpha', status=' C')
expected_skip = wc.State('', { })
]]]
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-04-01 21:59:30 CEST