Merge main into v7.1 (excluding extracted-files)#712
Open
dthaler wants to merge 1 commit into
Open
Conversation
dthaler
requested review from
albertemmerich,
clarkegj,
lynchrs3 and
tychonievich
as code owners
September 23, 2025 16:12
github-actions
Bot
force-pushed
the
merge-main-into-v7.1
branch
from
September 23, 2025 16:16
e45b539 to
a5d1590
Compare
tychonievich
requested changes
Sep 30, 2025
tychonievich
left a comment
tychonievich
left a comment
Collaborator
There was a problem hiding this comment.
Most of these changes are incorrectly reversing additions to v7.1. I'm worried that our merge action has some kind of error, as I don't expect merge to be undoing updates.
github-actions
Bot
force-pushed
the
merge-main-into-v7.1
branch
2 times, most recently
from
October 3, 2025 20:49
852cb59 to
0d6790e
Compare
github-actions
Bot
force-pushed
the
merge-main-into-v7.1
branch
from
November 23, 2025 00:30
0d6790e to
f87d885
Compare
github-actions
Bot
force-pushed
the
merge-main-into-v7.1
branch
2 times, most recently
from
February 17, 2026 17:07
8edf553 to
e1ef468
Compare
github-actions
Bot
force-pushed
the
merge-main-into-v7.1
branch
from
February 17, 2026 17:24
e1ef468 to
ad4a688
Compare
github-actions
Bot
force-pushed
the
merge-main-into-v7.1
branch
from
March 11, 2026 18:24
ad4a688 to
efb9e93
Compare
github-actions
Bot
force-pushed
the
merge-main-into-v7.1
branch
2 times, most recently
from
March 29, 2026 19:25
99859c3 to
986502b
Compare
github-actions
Bot
force-pushed
the
merge-main-into-v7.1
branch
from
April 28, 2026 17:06
986502b to
a3e32b8
Compare
github-actions
Bot
force-pushed
the
merge-main-into-v7.1
branch
from
May 26, 2026 17:15
a3e32b8 to
6a3a2bd
Compare
github-actions
Bot
force-pushed
the
merge-main-into-v7.1
branch
from
June 3, 2026 13:36
6a3a2bd to
1d975bc
Compare
tychonievich
self-requested a review
June 9, 2026 16:58
tychonievich
requested changes
Jun 9, 2026
| return full | ||
|
|
||
| doc = re.sub(r'<code>(g7:[^<]*)</code></h', r'<code class="uri">\1</code></h', doc) | ||
| doc = re.sub(r'<code>(g7.1:[^<]*)</code></h', r'<code class="uri">\1</code></h', doc) |
Collaborator
There was a problem hiding this comment.
This line should not be deleted
Comment on lines
-23
to
-26
| elif '`g7.1:' in bit: | ||
| si = bit.rfind('`g7.1:')+6 | ||
| ei = bit.find('`', si) | ||
| slug = bit[si:ei].replace('#','-') |
Collaborator
There was a problem hiding this comment.
These lines should not be deleted
| slug = table_tags[m.group(1)] | ||
| return linkify(m.group(0), slug) | ||
| return m.group(0) | ||
| uried = re.sub(r'(?<![\[.`])`g7(?:\.1)?:[-A-Z0-9a-z`._#]+`', repl, line) |
Collaborator
There was a problem hiding this comment.
This change should not be deleted
Comment on lines
-180
to
-181
| | `g7.1:record-INDI` | `g7:ADOP` | | ||
| | `g7:ADOP-FAMC` | `g7:FAMC-ADOP` | |
Collaborator
There was a problem hiding this comment.
These changes should not be deleted
| #### `HEADER` := | ||
|
|
||
| ```gedstruct | ||
| n HEAD {1:1} g7.1:HEAD |
Collaborator
There was a problem hiding this comment.
This and many other URIs should not change
github-actions
Bot
force-pushed
the
merge-main-into-v7.1
branch
from
June 9, 2026 17:06
1d975bc to
c970844
Compare
github-actions
Bot
force-pushed
the
merge-main-into-v7.1
branch
3 times, most recently
from
June 20, 2026 14:47
0668eb7 to
455a396
Compare
github-actions
Bot
force-pushed
the
merge-main-into-v7.1
branch
from
July 7, 2026 17:35
455a396 to
8a24dd6
Compare
github-actions
Bot
force-pushed
the
merge-main-into-v7.1
branch
from
July 14, 2026 17:30
8a24dd6 to
d984218
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Copy changes from main to v7.1, excluding extracted-files directory
The extracted-files will be handled separately by the generate-files workflow
This PR is auto-generated by [gh pr create].