Patchwork [2,of,3] tests: update tests for merging of releasenotes

login
register
mail settings
Submitter Rishabh Madan
Date June 11, 2017, 7:35 p.m.
Message ID <190c01f93c7140932d20.1497209707@bunty>
Download mbox | patch
Permalink /patch/21335/
State Superseded
Headers show

Comments

Rishabh Madan - June 11, 2017, 7:35 p.m.
# HG changeset patch
# User Rishabh Madan <rishabhmadan96@gmail.com>
# Date 1497208859 -7200
#      Sun Jun 11 21:20:59 2017 +0200
# Node ID 190c01f93c7140932d20ecee6ff659181d197cfd
# Parent  d2ab3803faab51e7998bb57a15e6d6daca90cf42
tests: update tests for merging of releasenotes

This patch makes changes to the tests for bullets that weren't working previously.
Augie Fackler - June 13, 2017, 2:47 p.m.
On Sun, Jun 11, 2017 at 09:35:07PM +0200, Rishabh Madan wrote:
> # HG changeset patch
> # User Rishabh Madan <rishabhmadan96@gmail.com>
> # Date 1497208859 -7200
> #      Sun Jun 11 21:20:59 2017 +0200
> # Node ID 190c01f93c7140932d20ecee6ff659181d197cfd
> # Parent  d2ab3803faab51e7998bb57a15e6d6daca90cf42
> tests: update tests for merging of releasenotes

Should this be combined with patch 1?

>
> This patch makes changes to the tests for bullets that weren't working previously.
>
> diff -r d2ab3803faab -r 190c01f93c71 tests/test-releasenotes-merging.t
> --- a/tests/test-releasenotes-merging.t	Sun Jun 11 21:17:00 2017 +0200
> +++ b/tests/test-releasenotes-merging.t	Sun Jun 11 21:20:59 2017 +0200
> @@ -34,8 +34,7 @@
>
>    * Fix from commit message.
>
> -Processing again will no-op
> -TODO this is buggy
> +Processing again ignores the already added bullet.
>
>    $ hg releasenotes -r . $TESTTMP/single-fix-bullet
>
> @@ -45,8 +44,6 @@
>
>    * Fix from release notes.
>
> -    Fix from commit message.
> -
>    * Fix from commit message.
>
>    $ cd ..
> @@ -111,7 +108,7 @@
>
>    $ cd ..
>
> -Bullets don't merge properly
> +Bullets from rev merge with those from notes file.
>
>    $ hg init bullets
>    $ cd bullets
> @@ -157,7 +154,7 @@
>
>    * this is fix1.
>
> -    this is fix2.
> +  * this is fix2.
>
>    * this is fix3.
>
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Rishabh Madan - June 13, 2017, 4:06 p.m.
On Tue, Jun 13, 2017 at 4:47 PM, Augie Fackler <raf@durin42.com> wrote:

> On Sun, Jun 11, 2017 at 09:35:07PM +0200, Rishabh Madan wrote:
> > # HG changeset patch
> > # User Rishabh Madan <rishabhmadan96@gmail.com>
> > # Date 1497208859 -7200
> > #      Sun Jun 11 21:20:59 2017 +0200
> > # Node ID 190c01f93c7140932d20ecee6ff659181d197cfd
> > # Parent  d2ab3803faab51e7998bb57a15e6d6daca90cf42
> > tests: update tests for merging of releasenotes
>
> Should this be combined with patch 1?
>

The changes in the tests are related to patch 1. So I'm fine with it either
way. You can confirm it though before I send V2.

>
> >
> > This patch makes changes to the tests for bullets that weren't working
> previously.
> >
> > diff -r d2ab3803faab -r 190c01f93c71 tests/test-releasenotes-merging.t
> > --- a/tests/test-releasenotes-merging.t       Sun Jun 11 21:17:00 2017
> +0200
> > +++ b/tests/test-releasenotes-merging.t       Sun Jun 11 21:20:59 2017
> +0200
> > @@ -34,8 +34,7 @@
> >
> >    * Fix from commit message.
> >
> > -Processing again will no-op
> > -TODO this is buggy
> > +Processing again ignores the already added bullet.
> >
> >    $ hg releasenotes -r . $TESTTMP/single-fix-bullet
> >
> > @@ -45,8 +44,6 @@
> >
> >    * Fix from release notes.
> >
> > -    Fix from commit message.
> > -
> >    * Fix from commit message.
> >
> >    $ cd ..
> > @@ -111,7 +108,7 @@
> >
> >    $ cd ..
> >
> > -Bullets don't merge properly
> > +Bullets from rev merge with those from notes file.
> >
> >    $ hg init bullets
> >    $ cd bullets
> > @@ -157,7 +154,7 @@
> >
> >    * this is fix1.
> >
> > -    this is fix2.
> > +  * this is fix2.
> >
> >    * this is fix3.
> >
> > _______________________________________________
> > Mercurial-devel mailing list
> > Mercurial-devel@mercurial-scm.org
> > https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>

Patch

diff -r d2ab3803faab -r 190c01f93c71 tests/test-releasenotes-merging.t
--- a/tests/test-releasenotes-merging.t	Sun Jun 11 21:17:00 2017 +0200
+++ b/tests/test-releasenotes-merging.t	Sun Jun 11 21:20:59 2017 +0200
@@ -34,8 +34,7 @@ 
   
   * Fix from commit message.
 
-Processing again will no-op
-TODO this is buggy
+Processing again ignores the already added bullet.
 
   $ hg releasenotes -r . $TESTTMP/single-fix-bullet
 
@@ -45,8 +44,6 @@ 
   
   * Fix from release notes.
   
-    Fix from commit message.
-  
   * Fix from commit message.
 
   $ cd ..
@@ -111,7 +108,7 @@ 
 
   $ cd ..
 
-Bullets don't merge properly
+Bullets from rev merge with those from notes file.
 
   $ hg init bullets
   $ cd bullets
@@ -157,7 +154,7 @@ 
   
   * this is fix1.
   
-    this is fix2.
+  * this is fix2.
   
   * this is fix3.