suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2026-08-24 08:22:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge dropping anchors

Browse Source
This commit is contained in:
Mike Farah
2021-02-11 10:58:40 +11:00
parent cfcac6d1dc
commit 429c3ca65b
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/yqlib/candidate_node.go
+2 -2
View File
@@ -63,8 +63,6 @@ func (n *CandidateNode) UpdateFrom(other *CandidateNode) {
n.UpdateAttributesFrom(other)
n.Node.Content = other.Node.Content
n.Node.Value = other.Node.Value
n.Node.Alias = other.Node.Alias
n.Node.Anchor = other.Node.Anchor
}
func (n *CandidateNode) UpdateAttributesFrom(other *CandidateNode) {
@@ -76,6 +74,8 @@ func (n *CandidateNode) UpdateAttributesFrom(other *CandidateNode) {
}
n.Node.Kind = other.Node.Kind
n.Node.Tag = other.Node.Tag
n.Node.Alias = other.Node.Alias
n.Node.Anchor = other.Node.Anchor
// merge will pickup the style of the new thing
// when autocreating nodes