[PATCH 2 of 3] tests: update tests for merging of releasenotes

[Augie Fackler]

On Sun, Jun 11, 2017 at 09:35:07PM +0200, Rishabh Madan wrote:
> # HG changeset patch
> # User Rishabh Madan <rishabhmadan96 at 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 at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel