You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Daniel Näslund <da...@longitudo.com> on 2010/02/02 18:38:19 UTC
[PATCH] Apply one hunk with offset in patch test for fuzz
Hi!
[[[
* subversion/tests/cmdline/patch_tests.py
(patch_with_fuzz): Add a test for applying a hunk with offset and fuzz
to this testcase.
Patch by: Daniel N�slund <daniel{_AT_}longitudo.com>
]]]
Re: [PATCH] Apply one hunk with offset in patch test for fuzz
Posted by Daniel Näslund <da...@longitudo.com>.
On Tue, Feb 02, 2010 at 06:43:56PM +0100, Stefan Sperling wrote:
> On Tue, Feb 02, 2010 at 06:38:19PM +0100, Daniel Näslund wrote:
> > Hi!
> >
> > [[[
> >
> > * subversion/tests/cmdline/patch_tests.py
> > (patch_with_fuzz): Add a test for applying a hunk with offset and fuzz
> > to this testcase.
> >
> > Patch by: Daniel Näslund <daniel{_AT_}longitudo.com>
> > ]]]
>
> > @@ -1142,6 +1144,7 @@
> >
> > expected_output = [
> > 'U %s\n' % os.path.join(wc_dir, 'A', 'mu'),
> > + '> applied hunk @@ -19,6 +20,7 @@ with offset 1\n',
> > ]
> > expected_disk = svntest.main.greek_state.copy()
> > expected_disk.tweak('A/mu', contents=''.join(mu_contents))
>
> I gather you'll later add the fuzz notification bits, and then
> this will say something like "with offset 1 and fuzz 2"?
This patch has been made obsolute by a later posted one including both
this testcase and the fuzz notifications part. I blame the contribulizer
for forcing me to send very small patches.
Daniel
Re: [PATCH] Apply one hunk with offset in patch test for fuzz
Posted by Daniel Näslund <da...@longitudo.com>.
On Tue, Feb 02, 2010 at 06:43:56PM +0100, Stefan Sperling wrote:
> On Tue, Feb 02, 2010 at 06:38:19PM +0100, Daniel Näslund wrote:
> > Hi!
> >
> > [[[
> >
> > * subversion/tests/cmdline/patch_tests.py
> > (patch_with_fuzz): Add a test for applying a hunk with offset and fuzz
> > to this testcase.
> >
> > Patch by: Daniel Näslund <daniel{_AT_}longitudo.com>
> > ]]]
>
> > @@ -1142,6 +1144,7 @@
> >
> > expected_output = [
> > 'U %s\n' % os.path.join(wc_dir, 'A', 'mu'),
> > + '> applied hunk @@ -19,6 +20,7 @@ with offset 1\n',
> > ]
> > expected_disk = svntest.main.greek_state.copy()
> > expected_disk.tweak('A/mu', contents=''.join(mu_contents))
>
> I gather you'll later add the fuzz notification bits, and then
> this will say something like "with offset 1 and fuzz 2"?
This patch has been made obsolute by a later posted one including both
this testcase and the fuzz notifications part. I blame the contribulizer
for forcing me to send very small patches.
Daniel
Re: [PATCH] Apply one hunk with offset in patch test for fuzz
Posted by Stefan Sperling <st...@elego.de>.
On Tue, Feb 02, 2010 at 06:38:19PM +0100, Daniel Näslund wrote:
> Hi!
>
> [[[
>
> * subversion/tests/cmdline/patch_tests.py
> (patch_with_fuzz): Add a test for applying a hunk with offset and fuzz
> to this testcase.
>
> Patch by: Daniel Näslund <daniel{_AT_}longitudo.com>
> ]]]
> @@ -1142,6 +1144,7 @@
>
> expected_output = [
> 'U %s\n' % os.path.join(wc_dir, 'A', 'mu'),
> + '> applied hunk @@ -19,6 +20,7 @@ with offset 1\n',
> ]
> expected_disk = svntest.main.greek_state.copy()
> expected_disk.tweak('A/mu', contents=''.join(mu_contents))
I gather you'll later add the fuzz notification bits, and then
this will say something like "with offset 1 and fuzz 2"?
Stefan
Re: [PATCH] Apply one hunk with offset in patch test for fuzz
Posted by Stefan Sperling <st...@elego.de>.
On Tue, Feb 02, 2010 at 06:38:19PM +0100, Daniel Näslund wrote:
> Hi!
>
> [[[
>
> * subversion/tests/cmdline/patch_tests.py
> (patch_with_fuzz): Add a test for applying a hunk with offset and fuzz
> to this testcase.
>
> Patch by: Daniel Näslund <daniel{_AT_}longitudo.com>
> ]]]
> @@ -1142,6 +1144,7 @@
>
> expected_output = [
> 'U %s\n' % os.path.join(wc_dir, 'A', 'mu'),
> + '> applied hunk @@ -19,6 +20,7 @@ with offset 1\n',
> ]
> expected_disk = svntest.main.greek_state.copy()
> expected_disk.tweak('A/mu', contents=''.join(mu_contents))
I gather you'll later add the fuzz notification bits, and then
this will say something like "with offset 1 and fuzz 2"?
Stefan