mergiraf/mergiraf
mergiraf/mergiraf
9
213
Fork 45
Code Issues 50 Pull requests 6 Releases 19 Activity Actions

fix(postprocess/merge_same_sigs): use the revisions that the node is actually known to be in #533

Merged
ada4a merged 2 commits from ada4a/mergiraf:521 into main 2025-07-26 14:56:51 +02:00
Conversation 0 Commits 2 Files changed 5 +27 -6
5 changed files with 27 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
examples/javascript/working/521/Base.js Normal file
View file

@ -0,0 +1,4 @@
module.exports = {
'to be [FAILED]' : function(test) {},
'to be [FAILED]' : function() {}
}

8
examples/javascript/working/521/Expected.js Normal file
View file

@ -0,0 +1,8 @@
module.exports = {
'to be [FAILED]' : function(test) {},
'to be [FAILED]' : function() {},
'to be with message [PASSED]' : function(test) {
var expect = this.client.api.expect.element('#weblogin').to.be.an('input', 'weblogin should be an input');
this.client.on('nightwatch:finished', function(results, errors) {})
},
}

8
examples/javascript/working/521/Left.js Normal file
View file

@ -0,0 +1,8 @@
module.exports = {
'to be [FAILED]' : function(test) {},
'to be [FAILED]' : function() {},
'to be with message [PASSED]' : function(test) {
var expect = this.client.api.expect.element('#weblogin').to.be.an('input', 'weblogin should be an input');
this.client.on('nightwatch:finished', function(results, errors) {})
}
}

4
examples/javascript/working/521/Right.js Normal file
View file

@ -0,0 +1,4 @@
module.exports = {
'to be [FAILED]' : function(test) {},
'to be [FAILED]' : function() {},
}

9
src/merged_tree/postprocess.rs
View file

@ -6,7 +6,7 @@ use regex::Regex;
use crate::{
ast::AstNode,
class_mapping::{ClassMapping, Leader, RevNode, RevisionNESet},
class_mapping::{ClassMapping, Leader, RevNode},
lang_profile::CommutativeParent,
merged_tree::MergedTree,
pcs::Revision,
@ -270,11 +270,8 @@ fn merge_same_sigs<'a>(
let v = add_separators(left_revnodes, separator, add_separator)
.into_iter()
.map(|rev_node| {
MergedTree::new_exact(
class_mapping.map_to_leader(rev_node),
RevisionNESet::singleton(Revision::Left).with(Revision::Right),
class_mapping,
)
let leader = class_mapping.map_to_leader(rev_node);
MergedTree::new_exact(leader, class_mapping.revision_set(&leader), class_mapping)
})
.collect();
(v, false)