Mercurial > hg
view tests/test-releasenotes-parsing.t @ 39224:5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
I think this is related to the octopus merge being sloppy, and that's having a
cascading affect on the fixup merge. If this change is made on p1 (specifically
with the 'Added parent file' commit), the failure doesn't occur.
The file modification with the rename doesn't seem to be necessary, but it's
what's happening in a production repo where I first noticed, so I left it. This
is an example of the manifest divergence I'd been seeing, which wasn't fixed by
Yuya's recent changes. This is separate from the changelog divergence I was
also seeing[1]. Probably nobody cares about bzr anymore, but this will also
affect git, since the octopus fixup code is in the hg sink.
[1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2018-August/120473.html
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Mon, 20 Aug 2018 16:19:36 -0400 |
parents | 3fff6f30bd7f |
children |
line wrap: on
line source
#require fuzzywuzzy $ cat >> $HGRCPATH << EOF > [extensions] > releasenotes= > EOF Bullet point with a single item spanning a single line $ hg debugparsereleasenotes - << EOF > New Features > ============ > > * Bullet point item with a single line > EOF section: feature bullet point: paragraph: Bullet point item with a single line Bullet point that spans multiple lines. $ hg debugparsereleasenotes - << EOF > New Features > ============ > > * Bullet point with a paragraph > that spans multiple lines. > EOF section: feature bullet point: paragraph: Bullet point with a paragraph that spans multiple lines. $ hg debugparsereleasenotes - << EOF > New Features > ============ > > * Bullet point with a paragraph > that spans multiple lines. > > And has an empty line between lines too. > With a line cuddling that. > EOF section: feature bullet point: paragraph: Bullet point with a paragraph that spans multiple lines. paragraph: And has an empty line between lines too. With a line cuddling that. Multiple bullet points. With some entries being multiple lines. $ hg debugparsereleasenotes - << EOF > New Features > ============ > > * First bullet point. It has a single line. > > * Second bullet point. > It consists of multiple lines. > > * Third bullet point. It has a single line. > EOF section: feature bullet point: paragraph: First bullet point. It has a single line. bullet point: paragraph: Second bullet point. It consists of multiple lines. bullet point: paragraph: Third bullet point. It has a single line. Bullet point without newline between items $ hg debugparsereleasenotes - << EOF > New Features > ============ > > * First bullet point > * Second bullet point > And it has multiple lines > * Third bullet point > * Fourth bullet point > EOF section: feature bullet point: paragraph: First bullet point bullet point: paragraph: Second bullet point And it has multiple lines bullet point: paragraph: Third bullet point bullet point: paragraph: Fourth bullet point Sub-section contents are read $ hg debugparsereleasenotes - << EOF > New Features > ============ > > First Feature > ------------- > > This is the first new feature that was implemented. > > And a second paragraph about it. > > Second Feature > -------------- > > This is the second new feature that was implemented. > > Paragraph two. > > Paragraph three. > EOF section: feature subsection: First Feature paragraph: This is the first new feature that was implemented. paragraph: And a second paragraph about it. subsection: Second Feature paragraph: This is the second new feature that was implemented. paragraph: Paragraph two. paragraph: Paragraph three. Multiple sections are read $ hg debugparsereleasenotes - << EOF > New Features > ============ > > * Feature 1 > * Feature 2 > > Bug Fixes > ========= > > * Fix 1 > * Fix 2 > EOF section: feature bullet point: paragraph: Feature 1 bullet point: paragraph: Feature 2 section: fix bullet point: paragraph: Fix 1 bullet point: paragraph: Fix 2 Mixed sub-sections and bullet list $ hg debugparsereleasenotes - << EOF > New Features > ============ > > Feature 1 > --------- > > Some words about the first feature. > > Feature 2 > --------- > > Some words about the second feature. > That span multiple lines. > > Other Changes > ------------- > > * Bullet item 1 > * Bullet item 2 > EOF section: feature subsection: Feature 1 paragraph: Some words about the first feature. subsection: Feature 2 paragraph: Some words about the second feature. That span multiple lines. bullet point: paragraph: Bullet item 1 bullet point: paragraph: Bullet item 2 Warn user in case of unexpected block while parsing $ hg init relnotes-warn $ cd relnotes-warn $ touch feature1 $ hg -q commit -A -l - << EOF > commit 1 > > .. feature:: > > new feature added. > some words about the feature. > EOF $ hg releasenote -r . changeset a4251905c440: unexpected block in release notes directive feature New Features ============ * new feature added. some words about the feature. $ cd ..